rustdesk/rustdesk-server
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk-server.git synced 2025-07-01 23:35:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

apply correct s6 overlay

Browse Source
This commit is contained in:
Paolo Asperti 2022-06-29 21:32:43 +02:00
parent de3ee5be04
commit e071dbcef0
No known key found for this signature in database
GPG Key ID: 06D46905D19D5182
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.github/workflows/build.yaml vendored
View File

@ -122,10 +122,10 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
job: job:
- { name: "amd64", docker_platform: "linux/amd64" } - { name: "amd64", docker_platform: "linux/amd64", s6_platform: "x86_64" }
- { name: "arm64v8", docker_platform: "linux/arm64" } - { name: "arm64v8", docker_platform: "linux/arm64", s6_platform: "aarch64" }
- { name: "armv7", docker_platform: "linux/arm/v7" } - { name: "armv7", docker_platform: "linux/arm/v7", s6_platform: "armhf" }
- { name: "i386", docker_platform: "linux/386" } - { name: "i386", docker_platform: "linux/386", s6_platform: "i686" }
steps: steps:
@ -174,6 +174,8 @@ jobs:
context: "./docker" context: "./docker"
platforms: ${{ matrix.job.docker_platform }} platforms: ${{ matrix.job.docker_platform }}
push: true push: true
build-args: |
S6_ARCH=${{ matrix.job.s6_platform }}
tags: | tags: |
${{ secrets.DOCKER_IMAGE }}:${{ env.LATEST_TAG }}-${{ matrix.job.name }} ${{ secrets.DOCKER_IMAGE }}:${{ env.LATEST_TAG }}-${{ matrix.job.name }}
${{ secrets.DOCKER_IMAGE }}:${{ env.GIT_TAG }}-${{ matrix.job.name }} ${{ secrets.DOCKER_IMAGE }}:${{ env.GIT_TAG }}-${{ matrix.job.name }}

7
docker/Dockerfile
View File

@ -1,13 +1,14 @@
FROM busybox:stable FROM busybox:stable
ARG S6_OVERLAY_VERSION=3.1.0.1 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-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 \ RUN \
tar -C / -Jxpf /tmp/s6-overlay-noarch.tar.xz && \ 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 rm /tmp/s6-overlay*.tar.xz
COPY rootfs / COPY rootfs /
ENV RELAY relay.example.com ENV RELAY relay.example.com