From 659febf3a5712f91aa8a0b9faea00c3732f67cbe Mon Sep 17 00:00:00 2001
From: Sebastian Hugentobler <sebastian@vanwa.ch>
Date: Tue, 12 Dec 2023 18:49:03 +0100
Subject: [PATCH] prepare action migration

---
 Dockerfile => Containerfile | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)
 rename Dockerfile => Containerfile (62%)

diff --git a/Dockerfile b/Containerfile
similarity index 62%
rename from Dockerfile
rename to Containerfile
index ba11f85..a325e5f 100644
--- a/Dockerfile
+++ b/Containerfile
@@ -1,7 +1,9 @@
-FROM docker.io/alpine:3.18 AS builder
+FROM docker.io/alpine:3.19 AS builder
 LABEL maintainer="Sebastian Hugentobler <sebastian@vanwa.ch>"
 
-ENV S6_OVERLAY_VERSION=v3.1.5.0
+ARG TARGET_ARCH=x86_64
+
+ENV S6_OVERLAY_VERSION=v3.1.6.2
 
 RUN apk --no-cache add \
 	git \
@@ -14,10 +16,11 @@ 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 -j4
+RUN make ARCH=$TARGET_ARCH-linux-musl -j4
+RUN mv /src/output/rootfs-overlay-${TARGET_ARCH}-linux-musl /src/output/rootfs-overlay-arch
 
 
-FROM docker.io/alpine:3.18
+FROM docker.io/alpine:3.19
 
 ENV LANG=en_US.UTF-8
 ENV S6_KEEP_ENV=1
@@ -25,11 +28,11 @@ 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 /
+COPY --from=builder /src/output/rootfs-overlay-arch /
 
 RUN apk --no-cache add \
-  syslog-ng \
-  tzdata
+	syslog-ng \
+	tzdata
 
 ENV TZ=Europe/Zurich