From 4a04cd422717b98b05bf3957f09c12bf5ff5534b Mon Sep 17 00:00:00 2001 From: "Dustin C. Hatch" Date: Mon, 25 Aug 2025 22:51:14 -0500 Subject: [PATCH] Rebase on scratch, update to v0.21.0 There's no reason we need anything from the _rsync_ container image to use Zola. Build pipelines that need to do more than run `zola build` can use different containers to access those tools. --- Containerfile | 9 +++++---- Jenkinsfile | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Containerfile b/Containerfile index f0b0035..5fb75c2 100644 --- a/Containerfile +++ b/Containerfile @@ -1,7 +1,8 @@ -FROM git.pyrocufflink.net/containerimages/rsync +FROM scratch -COPY --from=ghcr.io/getzola/zola:v0.16.1 /bin/zola /usr/local/bin/zola +COPY --from=ghcr.io/getzola/zola:v0.21.0 /bin/zola /bin/zola +COPY --from=registry.k8s.io/pause:3.9 /pause /bin/pause -USER jenkins +ENV PATH=/bin -CMD ["/bin/python3", "-c", "import signal; signal.pause()"] +CMD ["pause"] diff --git a/Jenkinsfile b/Jenkinsfile index 95632a5..155a960 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1 +1 @@ -buildContainerImage() +buildContainerImage2(archlist: ["amd64","arm64"])