N0rthernL1ghts/s6-rootfs
1
0
Fork 0
mirror of https://github.com/N0rthernL1ghts/s6-rootfs.git synced 2024-11-23 13:03:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:N0rthernL1ghts/s6-rootfs

Browse Source
This commit is contained in:
Aleksandar Puharic 2022-09-13 23:21:59 +02:00
commit f812dd5944
Signed by: xZero707
GPG Key ID: 3CC53DCAA9C237BB
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.github/workflows/image.yml vendored
View File

@ -9,9 +9,9 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: checkout code - name: checkout code
uses: actions/checkout@v2 uses: actions/checkout@v3
- name: Cache Docker layers - name: Cache Docker layers
uses: actions/cache@v2 uses: actions/cache@v3
id: cache id: cache
with: with:
path: /tmp/.buildx-cache path: /tmp/.buildx-cache
@ -19,15 +19,15 @@ jobs:
restore-keys: | restore-keys: |
${{ runner.os }}-buildx- ${{ runner.os }}-buildx-
- name: Set up QEMU - name: Set up QEMU
uses: docker/setup-qemu-action@v1 uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx - name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1 uses: docker/setup-buildx-action@v2
with: with:
config-inline: | config-inline: |
[worker.oci] [worker.oci]
max-parallelism = 16 max-parallelism = 16
- name: Login to DockerHub - name: Login to DockerHub
uses: docker/login-action@v1 uses: docker/login-action@v2
with: with:
username: ${{ secrets.DOCKER_USERNAME }} username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }} password: ${{ secrets.DOCKER_PASSWORD }}

4
Dockerfile
View File

@ -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 # 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 TARGETPLATFORM
ARG S6_OVERLAY_VERSION ARG S6_OVERLAY_VERSION
ARG S6_OVERLAY_RELEASE ARG S6_OVERLAY_RELEASE
@ -21,7 +21,7 @@ RUN apk add --no-cache wget \
# Third stage - Build rootfs from s6 parts # 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-base ["/s6overlay-base.tar.xz", "/s6overlay-base.tar.xz"]
COPY --from=downloader-s6-bin ["/s6overlay-bin.tar.xz", "/s6overlay-bin.tar.xz"] COPY --from=downloader-s6-bin ["/s6overlay-bin.tar.xz", "/s6overlay-bin.tar.xz"]