From 8d7160d8301f1ca887f2eccb0c4ead7ec301f807 Mon Sep 17 00:00:00 2001
From: Gerard Braad <me@gbraad.nl>
Date: Tue, 3 Dec 2024 07:42:47 +0000
Subject: [PATCH] Update container address

---
 .devcontainer/Containerfile                         |  2 +-
 .../workflows/{publish-docs.yml => gh-pages.yml}    |  0
 Makefile                                            |  4 ++--
 Containerfile => containers/Containerfile           |  9 +++++++--
 containers/README.md                                | 13 +++++++++++++
 5 files changed, 23 insertions(+), 5 deletions(-)
 rename .github/workflows/{publish-docs.yml => gh-pages.yml} (100%)
 rename Containerfile => containers/Containerfile (82%)
 create mode 100644 containers/README.md

diff --git a/.devcontainer/Containerfile b/.devcontainer/Containerfile
index ec31cad..eda268b 100644
--- a/.devcontainer/Containerfile
+++ b/.devcontainer/Containerfile
@@ -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
diff --git a/.github/workflows/publish-docs.yml b/.github/workflows/gh-pages.yml
similarity index 100%
rename from .github/workflows/publish-docs.yml
rename to .github/workflows/gh-pages.yml
diff --git a/Makefile b/Makefile
index 84f9e0f..2d6f147 100644
--- a/Makefile
+++ b/Makefile
@@ -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
@@ -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
diff --git a/Containerfile b/containers/Containerfile
similarity index 82%
rename from Containerfile
rename to containers/Containerfile
index da7dc61..1d12d32 100644
--- a/Containerfile
+++ b/containers/Containerfile
@@ -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 \
@@ -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
diff --git a/containers/README.md b/containers/README.md
new file mode 100644
index 0000000..4ee9299
--- /dev/null
+++ b/containers/README.md
@@ -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
+```