From de3ee5be04dfeb726ad35b719ede0249b10b379d Mon Sep 17 00:00:00 2001 From: Paolo Asperti Date: Wed, 29 Jun 2022 21:29:52 +0200 Subject: [PATCH 1/4] small typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e3745cd..69416db 100644 --- a/README.md +++ b/README.md @@ -94,7 +94,7 @@ Edit line 16 to point to your relay server (the one listening on port 21117). Yo ## S6-overlay based images -These images are build against `busybox:stable` with the addition of the binaries (both hbbr and hbbs) and [S6-overlay](https://github.com/just-containers/s6-overlay). They're available on [Docker hub](https://hub.docker.com/r/rustdesk/rustdesk-server-36/) with these tags: +These images are build against `busybox:stable` with the addition of the binaries (both hbbr and hbbs) and [S6-overlay](https://github.com/just-containers/s6-overlay). They're available on [Docker hub](https://hub.docker.com/r/rustdesk/rustdesk-server-s6/) with these tags: | architecture | version | image:tag | | --- | --- | --- | From e071dbcef011410798b14be7634ea2d32f350489 Mon Sep 17 00:00:00 2001 From: Paolo Asperti Date: Wed, 29 Jun 2022 21:32:43 +0200 Subject: [PATCH 2/4] apply correct s6 overlay --- .github/workflows/build.yaml | 10 ++++++---- 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 From dd7dec8435d9687f269364cf157b5b083f93e199 Mon Sep 17 00:00:00 2001 From: Paolo Asperti Date: Wed, 29 Jun 2022 21:33:38 +0200 Subject: [PATCH 3/4] updated s6-overlay --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 4304bdc..2ea6425 100755 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,6 +1,6 @@ FROM busybox:stable -ARG S6_OVERLAY_VERSION=3.1.0.1 +ARG S6_OVERLAY_VERSION=3.1.1.2 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-${S6_ARCH}.tar.xz /tmp From 7938c3d22ef48a625e7e25f3a7482b456dbe6cf5 Mon Sep 17 00:00:00 2001 From: Paolo Asperti Date: Wed, 29 Jun 2022 22:34:05 +0200 Subject: [PATCH 4/4] fix manifest creation --- .github/workflows/build.yaml | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 0a89e2d..603d0be 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -207,7 +207,7 @@ jobs: echo "MAJOR_TAG=$M" >> $GITHUB_ENV # manifest for :1.2.3 tag - - name: Create and push manifest + - name: Create and push manifest (:ve.rs.ion) uses: Noelware/docker-manifest-action@master with: base-image: ${{ secrets.DOCKER_IMAGE }}:${{ env.GIT_TAG }} @@ -215,7 +215,7 @@ jobs: push: true # manifest for :1 tag (major release) - - name: Create and push manifest + - name: Create and push manifest (:major) uses: Noelware/docker-manifest-action@master with: base-image: ${{ secrets.DOCKER_IMAGE }}:${{ env.MAJOR_TAG }} @@ -223,14 +223,7 @@ jobs: push: true # manifest for :latest tag - - name: Create and push manifest - uses: Noelware/docker-manifest-action@master - with: - base-image: ${{ secrets.DOCKER_IMAGE }}:${{ github.ref_name }} - extra-images: ${{ secrets.DOCKER_IMAGE }}:${{ github.ref_name }}-amd64,${{ secrets.DOCKER_IMAGE }}:${{ github.ref_name }}-arm64v8,${{ secrets.DOCKER_IMAGE }}:${{ github.ref_name }}-armv7,${{ secrets.DOCKER_IMAGE }}:${{ github.ref_name }}-i386 - push: true - - - name: Create and push manifest + - name: Create and push manifest (:latest) uses: Noelware/docker-manifest-action@master with: base-image: ${{ secrets.DOCKER_IMAGE }}:${{ env.LATEST_TAG }}