mirror of
https://github.com/N0rthernL1ghts/s6-rootfs.git
synced 2024-11-27 04:16:47 +01:00
Merge branch 'master' of github.com:N0rthernL1ghts/s6-rootfs
This commit is contained in:
commit
f812dd5944
10
.github/workflows/image.yml
vendored
10
.github/workflows/image.yml
vendored
|
@ -9,9 +9,9 @@ jobs:
|
|||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: checkout code
|
||||
uses: actions/checkout@v2
|
||||
uses: actions/checkout@v3
|
||||
- name: Cache Docker layers
|
||||
uses: actions/cache@v2
|
||||
uses: actions/cache@v3
|
||||
id: cache
|
||||
with:
|
||||
path: /tmp/.buildx-cache
|
||||
|
@ -19,15 +19,15 @@ jobs:
|
|||
restore-keys: |
|
||||
${{ runner.os }}-buildx-
|
||||
- name: Set up QEMU
|
||||
uses: docker/setup-qemu-action@v1
|
||||
uses: docker/setup-qemu-action@v2
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v1
|
||||
uses: docker/setup-buildx-action@v2
|
||||
with:
|
||||
config-inline: |
|
||||
[worker.oci]
|
||||
max-parallelism = 16
|
||||
- name: Login to DockerHub
|
||||
uses: docker/login-action@v1
|
||||
uses: docker/login-action@v2
|
||||
with:
|
||||
username: ${{ secrets.DOCKER_USERNAME }}
|
||||
password: ${{ secrets.DOCKER_PASSWORD }}
|
||||
|
|
|
@ -10,7 +10,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.15 AS downloader-s6-bin
|
||||
FROM --platform=${TARGETPLATFORM} alpine:3.16.2 AS downloader-s6-bin
|
||||
ARG TARGETPLATFORM
|
||||
ARG S6_OVERLAY_VERSION
|
||||
ARG S6_OVERLAY_RELEASE
|
||||
|
@ -21,7 +21,7 @@ RUN apk add --no-cache wget \
|
|||
|
||||
|
||||
# Third stage - Build rootfs from s6 parts
|
||||
FROM alpine:3.15 AS rootfs-builder
|
||||
FROM alpine:3.16.2 AS rootfs-builder
|
||||
|
||||
COPY --from=downloader-s6-base ["/s6overlay-base.tar.xz", "/s6overlay-base.tar.xz"]
|
||||
COPY --from=downloader-s6-bin ["/s6overlay-bin.tar.xz", "/s6overlay-bin.tar.xz"]
|
||||
|
|
Loading…
Reference in New Issue
Block a user