Add versions 3.2.0.0, 3.2.0.1 and 3.2.0.2

Bump docker/bake-action from 6.4.0 to 6.5.0

.github/workflows/image.yml

@@ -36,7 +36,7 @@ jobs:
           password: ${{secrets.PAT_TOKEN}}
       -
         name: Build and push
-        uses: docker/bake-action@v4.1.0
+        uses: docker/bake-action@v6.5.0
         with:
           files: build/docker-bake.hcl
           push: true

Dockerfile

@@ -1,4 +1,4 @@
-ARG S6_OVERLAY_VERSION="3.1.0.0"
+ARG S6_OVERLAY_VERSION="3.2.0.2"
 ARG S6_OVERLAY_RELEASE="https://github.com/just-containers/s6-overlay/releases/download/"
 ARG S6_OVERLAY_PAK_EXT=".tar.xz"
 
@@ -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.19 AS downloader-s6-bin
+FROM alpine:3.21 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.19 AS downloader-s6-sha256-sums
+FROM alpine:3.21 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.19 AS rootfs-builder
+FROM alpine:3.21 AS rootfs-builder
 
 COPY --from=downloader-s6-sha256-sums ["/SHA256SUMS", "/"]
 COPY --from=downloader-s6-base ["/s6overlay-base.tar.xz", "/s6overlay-base.tar.xz"]
@@ -66,4 +66,4 @@ FROM scratch AS s6-rootfs
 
 LABEL maintainer="Aleksandar Puharic <aleksandar@puharic.com>"
 
-COPY --from=rootfs-builder ["/rootfs-build/", "/"]
+COPY --from=rootfs-builder ["/rootfs-build/", "/"]

Dockerfile.legacy

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

README.md

@@ -2,6 +2,8 @@
 
 The simplest and fastest way to get S6 supervisor in your image
 
+NOTE: GitHub Actions builds are currently broken. Images are, however manually built, so you should be still getting latest version.
+
 ### Usage
 ```Docker
 COPY --from=ghcr.io/n0rthernl1ghts/s6-rootfs:latest ["/", "/"]
@@ -13,8 +15,7 @@ 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`.
+Note: We have moved to `ghcr.io`. Docker hub `docker.io/nlss/s6-rootfs` builds are discontinued.<br/>
 
 ###### Recommended way to integrate with your image (example)
 ```Docker

build/docker-bake.hcl

@@ -1,5 +1,15 @@
 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", "3_1_4_2", "3_1_5_0"]
+  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",
+    "3_2_0_0", "3_2_0_1", "3_2_0_2"
+  ]
 }
 
 target "build-dockerfile" {
@@ -19,7 +29,7 @@ target "build-common" {
 }
 
 variable "REGISTRY_CACHE" {
-  default = "docker.io/nlss/s6-rootfs-cache"
+  default = "ghcr.io/n0rthernl1ghts/s6-rootfs-cache"
 }
 
 ######################
@@ -68,12 +78,10 @@ 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}"
       ]
     ])
@@ -248,6 +256,54 @@ 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", "3.1.5", "latest"])
+  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"])
+  args       = get-args("3.1.6.2")
+}
+
+target "3_2_0_0" {
+  inherits   = ["build-dockerfile", "build-platforms", "build-common"]
+  cache-from = get-cache-from("3.2.0.0")
+  cache-to   = get-cache-to("3.2.0.0")
+  tags       = get-tags("3.2.0.0", [])
+  args       = get-args("3.2.0.0")
+}
+
+target "3_2_0_1" {
+  inherits   = ["build-dockerfile", "build-platforms", "build-common"]
+  cache-from = get-cache-from("3.2.0.1")
+  cache-to   = get-cache-to("3.2.0.1")
+  tags       = get-tags("3.2.0.1", [])
+  args       = get-args("3.2.0.0")
+}
+
+target "3_2_0_2" {
+  inherits   = ["build-dockerfile", "build-platforms", "build-common"]
+  cache-from = get-cache-from("3.2.0.2")
+  cache-to   = get-cache-to("3.2.0.2")
+  tags       = get-tags("3.2.0.2", ["3.2", "3.2.0", "latest"])
+  args       = get-args("3.2.0.2")
 }