update alpine to 3.21 and s6 to 3.2.0.2

.editorconfig

@@ -1,9 +0,0 @@
-root = true
-
-[*]
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-indent_style = space
-indent_size = 4

.gitea/workflows/container.yaml

@@ -0,0 +1,12 @@
+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 }}

.gitlab-ci.yml

@@ -1,26 +0,0 @@
-variables:
-  CONTAINER_NAME: thallian/alpine-s6
-
-build:
-  stage: build
-  image:
-    name: gcr.io/kaniko-project/executor:debug
-    entrypoint: [""]
-  script:
-    - mkdir -p /kaniko/.docker
-    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"auth\":\"$(printf "%s:%s" "$CI_REGISTRY_USER" "$CI_REGISTRY_PASSWORD" | base64 | tr -d '\n')\"}}}" > /kaniko/.docker/config.json
-    - >-
-      /kaniko/executor
-      --context "$CI_PROJECT_DIR"
-      --dockerfile "$CI_PROJECT_DIR/Dockerfile"
-      --destination "$CONTAINER_NAME:$CI_COMMIT_SHA"
-      --destination "$CONTAINER_NAME:$CI_COMMIT_REF_NAME"
-      --destination "$CONTAINER_NAME:latest"
-
-downstream:
-  stage: .post
-  trigger: containers/confd-env
-
-downstream-keycloak:
-  stage: .post
-  trigger: containers/keycloak

Containerfile

@@ -0,0 +1,44 @@
+FROM docker.io/alpine:3.21 AS builder
+LABEL maintainer="Sebastian Hugentobler <sebastian@vanwa.ch>"
+
+RUN apk --no-cache add \
+	curl \
+	tar \
+	xz
+
+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
+
+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
+RUN tar xf s6-overlay-noarch.tar.xz -C /overlay --strip 1
+
+RUN curl -L -O https://github.com/just-containers/s6-overlay/releases/download/$S6_OVERLAY_VERSION/s6-overlay-$(arch).tar.xz
+RUN eval "echo \"\${S6_HASH_$(arch)}  s6-overlay-$(arch).tar.xz\" | sha256sum -c -" || exit 1
+RUN tar xf s6-overlay-$(arch).tar.xz -C /overlay --strip 1
+
+
+FROM docker.io/alpine:3.21
+
+ENV LANG=en_US.UTF-8
+ENV S6_KEEP_ENV=1
+ENV PATH="$PATH:/command"
+ENV S6_GLOBAL_PATH="$PATH"
+
+COPY --from=builder /overlay /
+
+RUN apk --no-cache add \
+	syslog-ng \
+	tzdata
+
+ENV TZ=Europe/Zurich
+
+RUN apk --no-cache upgrade --ignore alpine-baselayout
+
+ADD /rootfs /
+
+ENTRYPOINT ["/init"]

Dockerfile

@@ -1,37 +0,0 @@
-FROM docker.io/alpine:3.16 AS builder
-LABEL maintainer="Sebastian Hugentobler <sebastian@vanwa.ch>"
-
-ENV S6_OVERLAY_VERSION=v3.1.1.2
-
-RUN apk --no-cache add \
-	git \
-	make \
-	binutils \
-	tar \
-	xz
-
-RUN git clone https://github.com/just-containers/s6-overlay.git /src
-WORKDIR /src
-RUN git checkout "$S6_OVERLAY_VERSION"
-
-RUN make ARCH=x86_64-linux-musl
-
-
-FROM docker.io/alpine:3.16
-
-ENV LANG=en_US.UTF-8
-ENV S6_KEEP_ENV=1
-ENV PATH="$PATH:/command"
-ENV S6_GLOBAL_PATH="$PATH"
-
-COPY --from=builder /src/output/rootfs-overlay-noarch /
-COPY --from=builder /src/output/rootfs-overlay-x86_64-linux-musl /
-
-RUN apk --no-cache add \
-    syslog-ng
-
-RUN apk --no-cache upgrade --ignore alpine-baselayout
-
-ADD /rootfs /
-
-ENTRYPOINT ["/init"]