From 308a7deb5d00eceddde74fc353caf65923074b2c Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Fri, 20 Jun 2025 13:34:10 +0200 Subject: [PATCH] push to alpine 3.22 and s6-overlay 3.2.1.0 --- .gitea/workflows/container.yaml | 12 ------------ Containerfile | 12 ++++++------ Jenkinsfile | 1 + 3 files changed, 7 insertions(+), 18 deletions(-) delete mode 100644 .gitea/workflows/container.yaml create mode 100644 Jenkinsfile diff --git a/.gitea/workflows/container.yaml b/.gitea/workflows/container.yaml deleted file mode 100644 index e48b3fd..0000000 --- a/.gitea/workflows/container.yaml +++ /dev/null @@ -1,12 +0,0 @@ -name: Build Multiarch Container Image -on: [push] -jobs: - call-reusable-workflow: - uses: container/multiarch-build-workflow/.gitea/workflows/build.yaml@main - with: - repository: ${{ gitea.repository }} - ref_name: ${{ gitea.ref_name }} - sha: ${{ gitea.sha }} - registry_url: ${{ secrets.REGISTRY_URL }} - registry_user: ${{ secrets.REGISTRY_USER }} - registry_pw: ${{ secrets.REGISTRY_PW }} diff --git a/Containerfile b/Containerfile index 14b0ef4..57b37ab 100644 --- a/Containerfile +++ b/Containerfile @@ -1,4 +1,4 @@ -FROM docker.io/alpine:3.21 AS builder +FROM docker.io/alpine:3.22 AS builder LABEL maintainer="Sebastian Hugentobler " RUN apk --no-cache add \ @@ -8,10 +8,10 @@ RUN apk --no-cache add \ RUN mkdir /overlay -ENV S6_OVERLAY_VERSION=v3.2.0.2 -ENV S6_HASH_noarch=6dbcde158a3e78b9bb141d7bcb5ccb421e563523babbe2c64470e76f4fd02dae -ENV S6_HASH_aarch64=8b22a2eaca4bf0b27a43d36e65c89d2701738f628d1abd0cea5569619f66f785 -ENV S6_HASH_x86_64=59289456ab1761e277bd456a95e737c06b03ede99158beb24f12b165a904f478 +ENV S6_OVERLAY_VERSION=v3.2.1.0 +ENV S6_HASH_noarch=42e038a9a00fc0fef70bf0bc42f625a9c14f8ecdfe77d4ad93281edf717e10c5 +ENV S6_HASH_aarch64=c8fd6b1f0380d399422fc986a1e6799f6a287e2cfa24813ad0b6a4fb4fa755cc +ENV S6_HASH_x86_64=8bcbc2cada58426f976b159dcc4e06cbb1454d5f39252b3bb0c778ccf71c9435 RUN curl -L -O https://github.com/just-containers/s6-overlay/releases/download/$S6_OVERLAY_VERSION/s6-overlay-noarch.tar.xz RUN echo "$S6_HASH_noarch s6-overlay-noarch.tar.xz" | sha256sum -c - || exit 1 @@ -22,7 +22,7 @@ RUN eval "echo \"\${S6_HASH_$(arch)} s6-overlay-$(arch).tar.xz\" | sha256sum -c RUN tar xf s6-overlay-$(arch).tar.xz -C /overlay --strip 1 -FROM docker.io/alpine:3.21 +FROM docker.io/alpine:3.22 ENV LANG=en_US.UTF-8 ENV S6_KEEP_ENV=1 diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..a8bfde8 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1 @@ +multiarch_container()