Skip to content

Commit

Permalink
Update container address
Browse files Browse the repository at this point in the history
  • Loading branch information
gbraad committed Dec 3, 2024
1 parent 97d1b0e commit 8d7160d
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/Containerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/crcont/antora:latest
FROM quay.io/crc-org/antora:3.1.9

RUN apk update \
&& apk add git
File renamed without changes.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ SHELL := /bin/bash -o pipefail

# Docs build related variables
DOCS_BUILD_DIR ?= public
DOCS_BUILD_CONTAINER ?= quay.io/crcont/antora:latest
DOCS_BUILD_CONTAINER ?= quay.io/crc-org/antora:3.1.9
DOCS_SERVE_CONTAINER ?= docker.io/httpd:alpine
DOCS_TEST_CONTAINER ?= docker.io/wjdp/htmltest:latest
DOCS_BUILD_TARGET ?= ./source/getting_started/master.adoc
Expand All @@ -15,7 +15,7 @@ endif

.PHONY: build_docs
build_docs:
${CONTAINER_RUNTIME} run -e CI -v $(CURDIR):/antora$(SELINUX_VOLUME_LABEL) --rm $(DOCS_BUILD_CONTAINER) --stacktrace antora-playbook.yml
${CONTAINER_RUNTIME} run -e CI -v $(CURDIR):/workspace$(SELINUX_VOLUME_LABEL) --rm $(DOCS_BUILD_CONTAINER) --stacktrace antora-playbook.yml

.PHONY: docs_serve
docs_serve: build_docs
Expand Down
9 changes: 7 additions & 2 deletions Containerfile → containers/Containerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
FROM docker.io/antora/antora
LABEL org.opencontainers.image.source="https://github.com/crc-org/crc"

LABEL org.opencontainers.image.source="https://github.com/crc-org/docs"

RUN yarn global add --ignore-optional --silent \
@antora/atlas-extension \
@antora/cli \
Expand All @@ -8,4 +10,7 @@ RUN yarn global add --ignore-optional --silent \
@antora/pdf-extension \
@antora/site-generator \
asciidoctor-kroki
RUN antora --version

RUN mkdir -p /workspace
VOLUME /workspace
WORKDIR /workspace
13 changes: 13 additions & 0 deletions containers/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
Antora generation image
=======================

This image is a modification of the upstream Alpine-based
image to contain a few additional extensions


## Usage instructions
```shell
$ podman run -v $PWD:/workspace \
quay.io/crc-org/antora:3.1.9 \
antora-playbook.yml
```

0 comments on commit 8d7160d

Please sign in to comment.