Add support for s6-overlay v3.1.6.2

Bump docker/setup-qemu-action from 2 to 3

.github/workflows/image.yml

@@ -10,29 +10,33 @@ jobs:
     steps:
       -
         name: checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       -
         name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       -
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
         with:
           config-inline: |
             [worker.oci]
               max-parallelism = 16
       -
         name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{github.actor}}
+          password: ${{secrets.PAT_TOKEN}}
       -
         name: Build and push
-        uses: docker/bake-action@v2.3.0
+        uses: docker/bake-action@v4.1.0
         with:
           files: build/docker-bake.hcl
-          push: true
-          set: |
-            *.cache-from=type=gha
-            *.cache-to=type=gha,mode=max
+          push: true

Dockerfile

@@ -11,7 +11,7 @@ ADD "${S6_OVERLAY_RELEASE}/v${S6_OVERLAY_VERSION}/s6-overlay-noarch${S6_OVERLAY_
 
 
 # Second stage - Download s6-overlay platform-dependent binaries and unpack
-FROM --platform=${TARGETPLATFORM} alpine:3.17.2 AS downloader-s6-bin
+FROM --platform=${TARGETPLATFORM} alpine:3.19 AS downloader-s6-bin
 ARG TARGETPLATFORM
 ARG S6_OVERLAY_VERSION
 ARG S6_OVERLAY_RELEASE
@@ -26,7 +26,7 @@ RUN set -eux \
 
 
 # Third stage - Download s6-overlay platform-dependent hashes
-FROM --platform=${TARGETPLATFORM} alpine:3.17.2 AS downloader-s6-sha256-sums
+FROM --platform=${TARGETPLATFORM} alpine:3.19 AS downloader-s6-sha256-sums
 ARG TARGETPLATFORM
 ARG S6_OVERLAY_VERSION
 ARG S6_OVERLAY_RELEASE
@@ -46,7 +46,7 @@ RUN set -eux \
 
 
 # Fourth stage - Build rootfs from s6 parts
-FROM alpine:3.17.2 AS rootfs-builder
+FROM alpine:3.19 AS rootfs-builder
 
 COPY --from=downloader-s6-sha256-sums ["/SHA256SUMS", "/"]
 COPY --from=downloader-s6-base ["/s6overlay-base.tar.xz", "/s6overlay-base.tar.xz"]

Dockerfile.legacy

@@ -1,5 +1,5 @@
 # First stage - Download s6-overlay and unpack it
-FROM --platform=${TARGETPLATFORM} alpine:3.17 AS downloader
+FROM --platform=${TARGETPLATFORM} alpine:3.19 AS downloader
 
 ARG TARGETPLATFORM
 

README.md

@@ -4,15 +4,18 @@ The simplest and fastest way to get S6 supervisor in your image
 
 ### Usage
 ```Docker
-COPY --from=nlss/s6-rootfs:latest ["/", "/"]
+COPY --from=ghcr.io/n0rthernl1ghts/s6-rootfs:latest ["/", "/"]
 ```
 or with fixed version:
 ```Docker
-COPY --from=nlss/s6-rootfs:3.1.2.1 ["/", "/"]
+COPY --from=ghcr.io/n0rthernl1ghts/s6-rootfs:3.1.2.1 ["/", "/"]
 ```
 
 That's it!
 
+Note: We're moving to ghcr.io. `docker.io/nlss/s6-rootfs` will be kept up-to-date until May 2023, when is Docker sunsetting free teams.<br/>
+It is highly recommended that you start using `ghcr.io/n0rthernl1ghts/s6-rootfs`.
+
 ###### Recommended way to integrate with your image (example)
 ```Docker
 # ---------------------
@@ -24,7 +27,7 @@ FROM scratch AS rootfs
 COPY ["./rootfs", "/"]
 
 # Install S6
-COPY --from=nlss/s6-rootfs:3.1.2.1 ["/", "/"]
+COPY --from=ghcr.io/n0rthernl1ghts/s6-rootfs:3.1.2.1 ["/", "/"]
 
 
 # ---------------------
@@ -34,5 +37,13 @@ FROM alpine:latest
 
 COPY --from=rootfs ["/", "/"]
 RUN apk add --update --no-cache nano
-```
 
+# S6 configuration - not required
+# See: https://github.com/just-containers/s6-overlay#customizing-s6-overlay-behaviour
+ENV S6_KEEP_ENVS6_KEEP_ENV=1
+ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2
+ENV S6_CMD_RECEIVE_SIGNALS=1
+
+# Important, this is required for S6 to work
+ENTRYPOINT ["/init"]
+```

build/docker-bake.hcl

@@ -1,5 +1,14 @@
 group "default" {
-  targets = ["2_1_0_2", "2_2_0_0", "2_2_0_1", "2_2_0_2", "2_2_0_3", "3_0_0_0", "3_0_0_1", "3_0_0_2", "3_0_0_2-2", "3_1_0_0", "3_1_0_1", "3_1_1_0", "3_1_1_1", "3_1_1_2", "3_1_2_0", "3_1_2_1", "3_1_3_0", "3_1_4_0", "3_1_4_1"]
+  targets = [
+    "2_1_0_2", "2_2_0_0", "2_2_0_1",
+    "2_2_0_2", "2_2_0_3", "3_0_0_0",
+    "3_0_0_1", "3_0_0_2", "3_0_0_2-2",
+    "3_1_0_0", "3_1_0_1", "3_1_1_0",
+    "3_1_1_1", "3_1_1_2", "3_1_2_0",
+    "3_1_2_1", "3_1_3_0", "3_1_4_0",
+    "3_1_4_1", "3_1_4_2", "3_1_5_0", 
+    "3_1_6_0", "3_1_6_1", "3_1_6_2"
+  ]
 }
 
 target "build-dockerfile" {
@@ -11,165 +20,267 @@ target "build-dockerfile-legacy" {
 }
 
 target "build-platforms" {
-  platforms = ["linux/amd64", "linux/armhf", "linux/aarch64"]
+  platforms = ["linux/amd64", "linux/aarch64"]
 }
 
 target "build-common" {
   pull = true
 }
 
-target "2_1_0_2" {
-  inherits = ["build-dockerfile-legacy", "build-platforms", "build-common"]
-  tags     = ["docker.io/nlss/s6-rootfs:2.1.0.2", "docker.io/nlss/s6-rootfs:2.1"]
-  args = {
-    S6_OVERLAY_VERSION = "2.1.0.2"
+variable "REGISTRY_CACHE" {
+  default = "docker.io/nlss/s6-rootfs-cache"
+}
+
+######################
+# Define the functions
+######################
+
+# Get the arguments for the build
+function "get-args" {
+  params = [version]
+  result = {
+    S6_OVERLAY_VERSION = version
   }
 }
 
+# Get the arguments for the build
+function "get-args-with-pak-ext" {
+  params = [version, pak_ext]
+  result = {
+    S6_OVERLAY_VERSION = version
+    S6_OVERLAY_PAK_EXT = pak_ext
+  }
+}
+
+# Get the cache-from configuration
+function "get-cache-from" {
+  params = [version]
+  result = [
+    "type=gha,scope=${version}_${BAKE_LOCAL_PLATFORM}",
+    "type=registry,ref=${REGISTRY_CACHE}:${sha1("${version}-${BAKE_LOCAL_PLATFORM}")}"
+  ]
+}
+
+# Get the cache-to configuration
+function "get-cache-to" {
+  params = [version]
+  result = [
+    "type=gha,mode=max,scope=${version}_${BAKE_LOCAL_PLATFORM}",
+    "type=registry,mode=max,ref=${REGISTRY_CACHE}:${sha1("${version}-${BAKE_LOCAL_PLATFORM}")}"
+  ]
+}
+
+# Get list of image tags and registries
+# Takes a version and a list of extra versions to tag
+# eg. get-tags("3.1.4.1", ["3.1", "latest"])
+function "get-tags" {
+  params = [version, extra_versions]
+  result = concat(
+    [
+      "docker.io/nlss/s6-rootfs:${version}",
+      "ghcr.io/n0rthernl1ghts/s6-rootfs:${version}"
+    ],
+    flatten([
+      for extra_version in extra_versions : [
+        "docker.io/nlss/s6-rootfs:${extra_version}",
+        "ghcr.io/n0rthernl1ghts/s6-rootfs:${extra_version}"
+      ]
+    ])
+  )
+}
+
+##########################
+# Define the build targets
+##########################
+
+target "2_1_0_2" {
+  inherits   = ["build-dockerfile-legacy", "build-platforms", "build-common"]
+  cache-from = get-cache-from("2.1.0.2")
+  cache-to   = get-cache-to("2.1.0.2")
+  tags       = get-tags("2.1.0.2", ["2.1"])
+  args       = get-args("2.1.0.2")
+}
+
 target "2_2_0_0" {
-  inherits = ["build-dockerfile-legacy", "build-platforms", "build-common"]
-  tags     = ["docker.io/nlss/s6-rootfs:2.2.0.0"]
-  args = {
-    S6_OVERLAY_VERSION = "2.2.0.0"
-  }
+  inherits   = ["build-dockerfile-legacy", "build-platforms", "build-common"]
+  cache-from = get-cache-from("2.2.0.0")
+  cache-to   = get-cache-to("2.2.0.0")
+  tags       = get-tags("2.2.0.0", [])
+  args       = get-args("2.2.0.0")
 }
 
 target "2_2_0_1" {
-  inherits = ["build-dockerfile-legacy", "build-platforms", "build-common"]
-  tags     = ["docker.io/nlss/s6-rootfs:2.2.0.1"]
-  args = {
-    S6_OVERLAY_VERSION = "2.2.0.1"
-  }
+  inherits   = ["build-dockerfile-legacy", "build-platforms", "build-common"]
+  cache-from = get-cache-from("2.2.0.1")
+  cache-to   = get-cache-to("2.2.0.1")
+  tags       = get-tags("2.2.0.1", [])
+  args       = get-args("2.2.0.1")
 }
 
 target "2_2_0_2" {
-  inherits = ["build-dockerfile-legacy", "build-platforms", "build-common"]
-  tags     = ["docker.io/nlss/s6-rootfs:2.2.0.2"]
-  args = {
-    S6_OVERLAY_VERSION = "2.2.0.2"
-  }
+  inherits   = ["build-dockerfile-legacy", "build-platforms", "build-common"]
+  cache-from = get-cache-from("2.2.0.2")
+  cache-to   = get-cache-to("2.2.0.2")
+  tags       = get-tags("2.2.0.2", [])
+  args       = get-args("2.2.0.2")
 }
 
 target "2_2_0_3" {
-  inherits = ["build-dockerfile-legacy", "build-platforms", "build-common"]
-  tags     = ["docker.io/nlss/s6-rootfs:2.2.0.3", "docker.io/nlss/s6-rootfs:2.2"]
-  args = {
-    S6_OVERLAY_VERSION = "2.2.0.3"
-  }
+  inherits   = ["build-dockerfile-legacy", "build-platforms", "build-common"]
+  cache-from = get-cache-from("2.2.0.3")
+  cache-to   = get-cache-to("2.2.0.3")
+  tags       = get-tags("2.2.0.3", ["2.2"])
+  args       = get-args("2.2.0.3")
 }
 
 target "3_0_0_0" {
-  inherits = ["build-dockerfile", "build-platforms", "build-common"]
-  tags     = ["docker.io/nlss/s6-rootfs:3.0.0.0", "docker.io/nlss/s6-rootfs:3.0.0.0-1"]
-  args = {
-    S6_OVERLAY_VERSION = "3.0.0.0-1"
-    S6_OVERLAY_PAK_EXT = "-3.0.0.0-1.tar.xz"
-  }
+  inherits   = ["build-dockerfile", "build-platforms", "build-common"]
+  cache-from = get-cache-from("3.0.0.0-1")
+  cache-to   = get-cache-to("3.0.0.0-1")
+  tags       = get-tags("3.0.0.0", ["3.0.0.0-1"])
+  args       = get-args-with-pak-ext("3.0.0.0-1", "-3.0.0.0-1.tar.xz")
 }
 
 target "3_0_0_1" {
-  inherits = ["build-dockerfile", "build-platforms", "build-common"]
-  tags     = ["docker.io/nlss/s6-rootfs:3.0.0.1"]
-  args = {
-    S6_OVERLAY_VERSION = "3.0.0.1"
-    S6_OVERLAY_PAK_EXT = "-3.0.0.1.tar.xz"
-  }
+  inherits   = ["build-dockerfile", "build-platforms", "build-common"]
+  cache-from = get-cache-from("3.0.0.1")
+  cache-to   = get-cache-to("3.0.0.1")
+  tags       = get-tags("3.0.0.1", [])
+  args       = get-args-with-pak-ext("3.0.0.1", "-3.0.0.1.tar.xz")
 }
 
 target "3_0_0_2" {
-  inherits = ["build-dockerfile", "build-platforms", "build-common"]
-  tags     = ["docker.io/nlss/s6-rootfs:3.0.0.2"]
-  args = {
-    S6_OVERLAY_VERSION = "3.0.0.2"
-    S6_OVERLAY_PAK_EXT = "-3.0.0.2.tar.xz"
-  }
+  inherits   = ["build-dockerfile", "build-platforms", "build-common"]
+  cache-from = get-cache-from("3.0.0.2")
+  cache-to   = get-cache-to("3.0.0.2")
+  tags       = get-tags("3.0.0.2", [])
+  args       = get-args-with-pak-ext("3.0.0.2", "-3.0.0.2.tar.xz")
 }
 
 target "3_0_0_2-2" {
-  inherits = ["build-dockerfile", "build-platforms", "build-common"]
-  tags     = ["docker.io/nlss/s6-rootfs:3.0.0.2-2", "docker.io/nlss/s6-rootfs:3.0"]
-  args = {
-    S6_OVERLAY_VERSION = "3.0.0.2-2"
-    S6_OVERLAY_PAK_EXT = "-3.0.0.2-2.tar.xz"
-  }
+  inherits   = ["build-dockerfile", "build-platforms", "build-common"]
+  cache-from = get-cache-from("3.0.0.2-2")
+  cache-to   = get-cache-to("3.0.0.2-2")
+  tags       = get-tags("3.0.0.2-2", ["3.0"])
+  args       = get-args-with-pak-ext("3.0.0.2-2", "-3.0.0.2-2.tar.xz")
 }
 
 target "3_1_0_0" {
-  inherits = ["build-dockerfile", "build-platforms", "build-common"]
-  tags     = ["docker.io/nlss/s6-rootfs:3.1.0.0"]
-  args = {
-    S6_OVERLAY_VERSION = "3.1.0.0"
-  }
+  inherits   = ["build-dockerfile", "build-platforms", "build-common"]
+  cache-from = get-cache-from("3.1.0.0")
+  cache-to   = get-cache-to("3.1.0.0")
+  tags       = get-tags("3.1.0.0", [])
+  args       = get-args("3.1.0.0")
 }
 
 target "3_1_0_1" {
-  inherits = ["build-dockerfile", "build-platforms", "build-common"]
-  tags     = ["docker.io/nlss/s6-rootfs:3.1.0.1"]
-  args = {
-    S6_OVERLAY_VERSION = "3.1.0.1"
-  }
+  inherits   = ["build-dockerfile", "build-platforms", "build-common"]
+  cache-from = get-cache-from("3.1.0.1")
+  cache-to   = get-cache-to("3.1.0.1")
+  tags       = get-tags("3.1.0.1", ["3.1.0"])
+  args       = get-args("3.1.0.1")
 }
 
 target "3_1_1_0" {
-  inherits = ["build-dockerfile", "build-platforms", "build-common"]
-  tags     = ["docker.io/nlss/s6-rootfs:3.1.1.0"]
-  args = {
-    S6_OVERLAY_VERSION = "3.1.1.0"
-  }
+  inherits   = ["build-dockerfile", "build-platforms", "build-common"]
+  cache-from = get-cache-from("3.1.1.0")
+  cache-to   = get-cache-to("3.1.1.0")
+  tags       = get-tags("3.1.1.0", [])
+  args       = get-args("3.1.1.0")
 }
 
 target "3_1_1_1" {
-  inherits = ["build-dockerfile", "build-platforms", "build-common"]
-  tags     = ["docker.io/nlss/s6-rootfs:3.1.1.1"]
-  args = {
-    S6_OVERLAY_VERSION = "3.1.1.1"
-  }
+  inherits   = ["build-dockerfile", "build-platforms", "build-common"]
+  cache-from = get-cache-from("3.1.1.1")
+  cache-to   = get-cache-to("3.1.1.1")
+  tags       = get-tags("3.1.1.1", [])
+  args       = get-args("3.1.1.1")
 }
 
 target "3_1_1_2" {
-  inherits = ["build-dockerfile", "build-platforms", "build-common"]
-  tags     = ["docker.io/nlss/s6-rootfs:3.1.1.2"]
-  args = {
-    S6_OVERLAY_VERSION = "3.1.1.2"
-  }
+  inherits   = ["build-dockerfile", "build-platforms", "build-common"]
+  cache-from = get-cache-from("3.1.1.2")
+  cache-to   = get-cache-to("3.1.1.2")
+  tags       = get-tags("3.1.1.2", ["3.1", "3.1.1"])
+  args       = get-args("3.1.1.2")
 }
 
 target "3_1_2_0" {
-  inherits = ["build-dockerfile", "build-platforms", "build-common"]
-  tags     = ["docker.io/nlss/s6-rootfs:3.1.2.0"]
-  args = {
-    S6_OVERLAY_VERSION = "3.1.2.0"
-  }
+  inherits   = ["build-dockerfile", "build-platforms", "build-common"]
+  cache-from = get-cache-from("3.1.2.0")
+  cache-to   = get-cache-to("3.1.2.0")
+  tags       = get-tags("3.1.2.0", [])
+  args       = get-args("3.1.2.0")
 }
 
 target "3_1_2_1" {
-  inherits = ["build-dockerfile", "build-platforms", "build-common"]
-  tags     = ["docker.io/nlss/s6-rootfs:3.1.2.1"]
-  args = {
-    S6_OVERLAY_VERSION = "3.1.2.1"
-  }
+  inherits   = ["build-dockerfile", "build-platforms", "build-common"]
+  cache-from = get-cache-from("3.1.2.1")
+  cache-to   = get-cache-to("3.1.2.1")
+  tags       = get-tags("3.1.2.1", ["3.1.2"])
+  args       = get-args("3.1.2.1")
 }
 
 target "3_1_3_0" {
-  inherits = ["build-dockerfile", "build-platforms", "build-common"]
-  tags     = ["docker.io/nlss/s6-rootfs:3.1.3.0"]
-  args = {
-    S6_OVERLAY_VERSION = "3.1.3.0"
-  }
+  inherits   = ["build-dockerfile", "build-platforms", "build-common"]
+  cache-from = get-cache-from("3.1.3.0")
+  cache-to   = get-cache-to("3.1.3.0")
+  tags       = get-tags("3.1.3.0", ["3.1.3"])
+  args       = get-args("3.1.3.0")
 }
 
 target "3_1_4_0" {
-  inherits = ["build-dockerfile", "build-platforms", "build-common"]
-  tags     = ["docker.io/nlss/s6-rootfs:3.1.4.0"]
-  args = {
-    S6_OVERLAY_VERSION = "3.1.4.0"
-  }
+  inherits   = ["build-dockerfile", "build-platforms", "build-common"]
+  cache-from = get-cache-from("3.1.4.0")
+  cache-to   = get-cache-to("3.1.4.0")
+  tags       = get-tags("3.1.4.0", [])
+  args       = get-args("3.1.4.0")
 }
 
 target "3_1_4_1" {
-  inherits = ["build-dockerfile", "build-platforms", "build-common"]
-  tags     = ["docker.io/nlss/s6-rootfs:3.1.4.1", "docker.io/nlss/s6-rootfs:3.1", "docker.io/nlss/s6-rootfs:latest"]
-  args = {
-    S6_OVERLAY_VERSION = "3.1.4.1"
-  }
+  inherits   = ["build-dockerfile", "build-platforms", "build-common"]
+  cache-from = get-cache-from("3.1.4.1")
+  cache-to   = get-cache-to("3.1.4.1")
+  tags       = get-tags("3.1.4.1", [])
+  args       = get-args("3.1.4.1")
+}
+
+target "3_1_4_2" {
+  inherits   = ["build-dockerfile", "build-platforms", "build-common"]
+  cache-from = get-cache-from("3.1.4.2")
+  cache-to   = get-cache-to("3.1.4.2")
+  tags       = get-tags("3.1.4.2", ["3.1.4"])
+  args       = get-args("3.1.4.2")
+}
+
+target "3_1_5_0" {
+  inherits   = ["build-dockerfile", "build-platforms", "build-common"]
+  cache-from = get-cache-from("3.1.5.0")
+  cache-to   = get-cache-to("3.1.5.0")
+  tags       = get-tags("3.1.5.0", ["3.1.5"])
+  args       = get-args("3.1.5.0")
+}
+
+target "3_1_6_0" {
+  inherits   = ["build-dockerfile", "build-platforms", "build-common"]
+  cache-from = get-cache-from("3.1.6.0")
+  cache-to   = get-cache-to("3.1.6.0")
+  tags       = get-tags("3.1.6.0", [])
+  args       = get-args("3.1.6.0")
+}
+
+target "3_1_6_1" {
+  inherits   = ["build-dockerfile", "build-platforms", "build-common"]
+  cache-from = get-cache-from("3.1.6.1")
+  cache-to   = get-cache-to("3.1.6.1")
+  tags       = get-tags("3.1.6.1", [])
+  args       = get-args("3.1.6.1")
+}
+
+target "3_1_6_2" {
+  inherits   = ["build-dockerfile", "build-platforms", "build-common"]
+  cache-from = get-cache-from("3.1.6.2")
+  cache-to   = get-cache-to("3.1.6.2")
+  tags       = get-tags("3.1.6.2", ["3.1", "3.1.6", "latest"])
+  args       = get-args("3.1.6.2")
 }