rustdesk/rustdesk-server
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk-server.git synced 2026-02-16 10:30:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #50 from paspo/gh_actions

Browse Source 
Fix github actions
This commit is contained in:
RustDesk
2022-06-30 09:39:01 +08:00
committed by GitHub
parent 6c6dba5a8a 7938c3d22e
commit 052788823f
3 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
.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 }}
@@ -205,7 +207,7 @@ jobs:
echo "MAJOR_TAG=$M" >> $GITHUB_ENV echo "MAJOR_TAG=$M" >> $GITHUB_ENV
# manifest for :1.2.3 tag # 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 uses: Noelware/docker-manifest-action@master
with: with:
base-image: ${{ secrets.DOCKER_IMAGE }}:${{ env.GIT_TAG }} base-image: ${{ secrets.DOCKER_IMAGE }}:${{ env.GIT_TAG }}
@@ -213,7 +215,7 @@ jobs:
push: true push: true
# manifest for :1 tag (major release) # manifest for :1 tag (major release)
- name: Create and push manifest - name: Create and push manifest (:major)
uses: Noelware/docker-manifest-action@master uses: Noelware/docker-manifest-action@master
with: with:
base-image: ${{ secrets.DOCKER_IMAGE }}:${{ env.MAJOR_TAG }} base-image: ${{ secrets.DOCKER_IMAGE }}:${{ env.MAJOR_TAG }}
@@ -221,14 +223,7 @@ jobs:
push: true push: true
# manifest for :latest tag # manifest for :latest tag
- name: Create and push manifest - name: Create and push manifest (:latest)
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
uses: Noelware/docker-manifest-action@master uses: Noelware/docker-manifest-action@master
with: with:
base-image: ${{ secrets.DOCKER_IMAGE }}:${{ env.LATEST_TAG }} base-image: ${{ secrets.DOCKER_IMAGE }}:${{ env.LATEST_TAG }}

2
README.md
View File

@@ -94,7 +94,7 @@ Edit line 16 to point to your relay server (the one listening on port 21117). Yo
## S6-overlay based images ## 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 | | architecture | version | image:tag |
| --- | --- | --- | | --- | --- | --- |

9
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.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-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