diff options
| author | Paolo Asperti <[email protected]> | 2022-06-29 21:32:43 +0200 |
|---|---|---|
| committer | Paolo Asperti <[email protected]> | 2022-06-29 21:32:43 +0200 |
| commit | e071dbcef011410798b14be7634ea2d32f350489 (patch) | |
| tree | 37c490b877907365d207386917881c6a567dc0ab | |
| parent | de3ee5be04dfeb726ad35b719ede0249b10b379d (diff) | |
| download | rustdesk-server-e071dbcef011410798b14be7634ea2d32f350489.tar.gz rustdesk-server-e071dbcef011410798b14be7634ea2d32f350489.zip | |
apply correct s6 overlay
| -rw-r--r-- | .github/workflows/build.yaml | 10 | ||||
| -rwxr-xr-x | docker/Dockerfile | 7 |
2 files changed, 10 insertions, 7 deletions
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 633c2d4..0a89e2d 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -122,10 +122,10 @@ jobs: fail-fast: false matrix: job: - - { name: "amd64", docker_platform: "linux/amd64" } - - { name: "arm64v8", docker_platform: "linux/arm64" } - - { name: "armv7", docker_platform: "linux/arm/v7" } - - { name: "i386", docker_platform: "linux/386" } + - { name: "amd64", docker_platform: "linux/amd64", s6_platform: "x86_64" } + - { name: "arm64v8", docker_platform: "linux/arm64", s6_platform: "aarch64" } + - { name: "armv7", docker_platform: "linux/arm/v7", s6_platform: "armhf" } + - { name: "i386", docker_platform: "linux/386", s6_platform: "i686" } steps: @@ -174,6 +174,8 @@ jobs: context: "./docker" platforms: ${{ matrix.job.docker_platform }} push: true + build-args: | + S6_ARCH=${{ matrix.job.s6_platform }} tags: | ${{ secrets.DOCKER_IMAGE }}:${{ env.LATEST_TAG }}-${{ matrix.job.name }} ${{ secrets.DOCKER_IMAGE }}:${{ env.GIT_TAG }}-${{ matrix.job.name }} diff --git a/docker/Dockerfile b/docker/Dockerfile index c68677b..4304bdc 100755 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,13 +1,14 @@ FROM busybox:stable ARG S6_OVERLAY_VERSION=3.1.0.1 +ARG S6_ARCH=x86_64 ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz /tmp -ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-x86_64.tar.xz /tmp +ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-${S6_ARCH}.tar.xz /tmp RUN \ tar -C / -Jxpf /tmp/s6-overlay-noarch.tar.xz && \ - tar -C / -Jxpf /tmp/s6-overlay-x86_64.tar.xz && \ + tar -C / -Jxpf /tmp/s6-overlay-${S6_ARCH}.tar.xz && \ rm /tmp/s6-overlay*.tar.xz - + COPY rootfs / ENV RELAY relay.example.com |