N0rthernL1ghts/s6-rootfs
1
0
Fork 0
mirror of https://github.com/N0rthernL1ghts/s6-rootfs.git synced 2024-11-27 06:30:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Simplify

Browse Source
This commit is contained in:
Aleksandar Puharic 2022-09-14 00:56:16 +02:00
parent 44e226500d
commit 779eef0d71
Signed by: xZero707
GPG Key ID: 3CC53DCAA9C237BB
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Dockerfile
View File

@ -1,14 +1,13 @@
ARG S6_OVERLAY_VERSION="3.0.0.2" ARG S6_OVERLAY_VERSION="3.0.0.2"
ARG S6_OVERLAY_RELEASE="https://github.com/just-containers/s6-overlay/releases/download/" ARG S6_OVERLAY_RELEASE="https://github.com/just-containers/s6-overlay/releases/download/"
ARG S6_OVERLAY_BIN_PAK_EXT=".tar.xz" ARG S6_OVERLAY_PAK_EXT=".tar.xz"
ARG S6_OVERLAY_BASE_PAK_EXT=".tar.xz"
# First stage - Download s6-overlay noarch base and unpack it # First stage - Download s6-overlay noarch base and unpack it
FROM scratch AS downloader-s6-base FROM scratch AS downloader-s6-base
ARG S6_OVERLAY_VERSION ARG S6_OVERLAY_VERSION
ARG S6_OVERLAY_RELEASE ARG S6_OVERLAY_RELEASE
ARG S6_OVERLAY_BASE_PAK_EXT ARG S6_OVERLAY_PAK_EXT
ADD "${S6_OVERLAY_RELEASE}/v${S6_OVERLAY_VERSION}/s6-overlay-noarch${S6_OVERLAY_BASE_PAK_EXT}" /s6overlay-base.tar.xz ADD "${S6_OVERLAY_RELEASE}/v${S6_OVERLAY_VERSION}/s6-overlay-noarch${S6_OVERLAY_PAK_EXT}" /s6overlay-base.tar.xz
# Second stage - Download s6-overlay platform-dependent binaries and unpack # Second stage - Download s6-overlay platform-dependent binaries and unpack
@ -16,8 +15,8 @@ FROM --platform=${TARGETPLATFORM} alpine:3.16.2 AS downloader-s6-bin
ARG TARGETPLATFORM ARG TARGETPLATFORM
ARG S6_OVERLAY_VERSION ARG S6_OVERLAY_VERSION
ARG S6_OVERLAY_RELEASE ARG S6_OVERLAY_RELEASE
ARG S6_OVERLAY_BIN_PAK_EXT ARG S6_OVERLAY_PAK_EXT
ARG S6_OVERLAY_RELEASE_URL="${S6_OVERLAY_RELEASE}/v${S6_OVERLAY_VERSION}/s6-overlay-${TARGETPLATFORM}${S6_OVERLAY_BIN_PAK_EXT}" ARG S6_OVERLAY_RELEASE_URL="${S6_OVERLAY_RELEASE}/v${S6_OVERLAY_VERSION}/s6-overlay-${TARGETPLATFORM}${S6_OVERLAY_PAK_EXT}"
RUN apk add --no-cache wget \ RUN apk add --no-cache wget \
&& wget -O /s6overlay-bin.tar.xz "$(echo ${S6_OVERLAY_RELEASE_URL} | sed 's/linux\///g' | sed 's/amd64/x86_64/g' | sed 's/arm64/aarch64/g' | sed 's/arm\/v7/armhf/g')" && wget -O /s6overlay-bin.tar.xz "$(echo ${S6_OVERLAY_RELEASE_URL} | sed 's/linux\///g' | sed 's/amd64/x86_64/g' | sed 's/arm64/aarch64/g' | sed 's/arm\/v7/armhf/g')"

12
build/docker-bake.hcl
View File

@ -63,8 +63,7 @@ target "3_0_0_0" {
tags = ["docker.io/nlss/s6-rootfs:3.0.0.0", "docker.io/nlss/s6-rootfs:3.0.0.0-1"] tags = ["docker.io/nlss/s6-rootfs:3.0.0.0", "docker.io/nlss/s6-rootfs:3.0.0.0-1"]
args = { args = {
S6_OVERLAY_VERSION = "3.0.0.0-1" S6_OVERLAY_VERSION = "3.0.0.0-1"
S6_OVERLAY_BIN_PAK_EXT = "-3.0.0.0-1.tar.xz" S6_OVERLAY_PAK_EXT = "-3.0.0.0-1.tar.xz"
S6_OVERLAY_BASE_PAK_EXT = "-3.0.0.0-1.tar.xz"
} }
} }
@ -73,8 +72,7 @@ target "3_0_0_1" {
tags = ["docker.io/nlss/s6-rootfs:3.0.0.1"] tags = ["docker.io/nlss/s6-rootfs:3.0.0.1"]
args = { args = {
S6_OVERLAY_VERSION = "3.0.0.1" S6_OVERLAY_VERSION = "3.0.0.1"
S6_OVERLAY_BIN_PAK_EXT = "-3.0.0.1.tar.xz" S6_OVERLAY_PAK_EXT = "-3.0.0.1.tar.xz"
S6_OVERLAY_BASE_PAK_EXT = "-3.0.0.1.tar.xz"
} }
} }
@ -83,8 +81,7 @@ target "3_0_0_2" {
tags = ["docker.io/nlss/s6-rootfs:3.0.0.2"] tags = ["docker.io/nlss/s6-rootfs:3.0.0.2"]
args = { args = {
S6_OVERLAY_VERSION = "3.0.0.2" S6_OVERLAY_VERSION = "3.0.0.2"
S6_OVERLAY_BIN_PAK_EXT = "-3.0.0.2.tar.xz" S6_OVERLAY_PAK_EXT = "-3.0.0.2.tar.xz"
S6_OVERLAY_BASE_PAK_EXT = "-3.0.0.2.tar.xz"
} }
} }
@ -93,8 +90,7 @@ target "3_0_0_2-2" {
tags = ["docker.io/nlss/s6-rootfs:3.0.0.2-2", "docker.io/nlss/s6-rootfs:3.0"] tags = ["docker.io/nlss/s6-rootfs:3.0.0.2-2", "docker.io/nlss/s6-rootfs:3.0"]
args = { args = {
S6_OVERLAY_VERSION = "3.0.0.2-2" S6_OVERLAY_VERSION = "3.0.0.2-2"
S6_OVERLAY_BIN_PAK_EXT = "-3.0.0.2-2.tar.xz" S6_OVERLAY_PAK_EXT = "-3.0.0.2-2.tar.xz"
S6_OVERLAY_BASE_PAK_EXT = "-3.0.0.2-2.tar.xz"
} }
} }