From 4ebe453d7c82794ce59fba714169320424470ddd Mon Sep 17 00:00:00 2001 From: "Dustin C. Hatch" Date: Mon, 25 Aug 2025 22:51:14 -0500 Subject: [PATCH] Rebase on upstream, update to v0.21.0 Although we don't really need anything but Zola in this image, we can't use the upstream image directly in a Jenkins job because it doesn't contain a shell or any other utility that can "pause" the container. Therefore, we do need to install the `pause` command, but we don't need anything else from the _rsync_ image. --- Containerfile | 8 +++----- Jenkinsfile | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Containerfile b/Containerfile index f0b0035..f5d3005 100644 --- a/Containerfile +++ b/Containerfile @@ -1,7 +1,5 @@ -FROM git.pyrocufflink.net/containerimages/rsync +FROM ghcr.io/getzola/zola:v0.21.0 -COPY --from=ghcr.io/getzola/zola:v0.16.1 /bin/zola /usr/local/bin/zola +COPY --from=registry.k8s.io/pause:3.9 /pause /bin/pause -USER jenkins - -CMD ["/bin/python3", "-c", "import signal; signal.pause()"] +ENTRYPOINT ["zola"] diff --git a/Jenkinsfile b/Jenkinsfile index 95632a5..155a960 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1 +1 @@ -buildContainerImage() +buildContainerImage2(archlist: ["amd64","arm64"])