Просмотр исходного кода

Merge pull request #50 from paspo/gh_actions

Fix github actions
RustDesk лет назад: 3
Родитель
Сommit
052788823f
3 измененных файлов с 15 добавлено и 19 удалено
  1. 9 14
      .github/workflows/build.yaml
  2. 1 1
      README.md
  3. 5 4
      docker/Dockerfile

+ 9 - 14
.github/workflows/build.yaml

@@ -122,10 +122,10 @@ jobs:
122
       fail-fast: false
122
       fail-fast: false
123
       matrix:
123
       matrix:
124
         job:
124
         job:
125
-          - { name: "amd64",   docker_platform: "linux/amd64" }
126
-          - { name: "arm64v8", docker_platform: "linux/arm64" }
127
-          - { name: "armv7",   docker_platform: "linux/arm/v7" }
128
-          - { name: "i386",    docker_platform: "linux/386" }
125
+          - { name: "amd64",   docker_platform: "linux/amd64",  s6_platform: "x86_64" }
126
+          - { name: "arm64v8", docker_platform: "linux/arm64",  s6_platform: "aarch64" }
127
+          - { name: "armv7",   docker_platform: "linux/arm/v7", s6_platform: "armhf" }
128
+          - { name: "i386",    docker_platform: "linux/386",    s6_platform: "i686" }
129
 
129
 
130
     steps:
130
     steps:
131
 
131
 
@@ -174,6 +174,8 @@ jobs:
174
           context: "./docker"
174
           context: "./docker"
175
           platforms: ${{ matrix.job.docker_platform }}
175
           platforms: ${{ matrix.job.docker_platform }}
176
           push: true
176
           push: true
177
+          build-args: |
178
+            S6_ARCH=${{ matrix.job.s6_platform }}
177
           tags: |
179
           tags: |
178
             ${{ secrets.DOCKER_IMAGE }}:${{ env.LATEST_TAG }}-${{ matrix.job.name }}
180
             ${{ secrets.DOCKER_IMAGE }}:${{ env.LATEST_TAG }}-${{ matrix.job.name }}
179
             ${{ secrets.DOCKER_IMAGE }}:${{ env.GIT_TAG }}-${{ matrix.job.name }}
181
             ${{ secrets.DOCKER_IMAGE }}:${{ env.GIT_TAG }}-${{ matrix.job.name }}
@@ -205,7 +207,7 @@ jobs:
205
           echo "MAJOR_TAG=$M" >> $GITHUB_ENV
207
           echo "MAJOR_TAG=$M" >> $GITHUB_ENV
206
 
208
 
207
       # manifest for :1.2.3 tag
209
       # manifest for :1.2.3 tag
208
-      - name: Create and push manifest
210
+      - name: Create and push manifest (:ve.rs.ion)
209
         uses: Noelware/docker-manifest-action@master
211
         uses: Noelware/docker-manifest-action@master
210
         with:
212
         with:
211
           base-image: ${{ secrets.DOCKER_IMAGE }}:${{ env.GIT_TAG }}
213
           base-image: ${{ secrets.DOCKER_IMAGE }}:${{ env.GIT_TAG }}
@@ -213,7 +215,7 @@ jobs:
213
           push: true
215
           push: true
214
 
216
 
215
       # manifest for :1 tag (major release)
217
       # manifest for :1 tag (major release)
216
-      - name: Create and push manifest
218
+      - name: Create and push manifest (:major)
217
         uses: Noelware/docker-manifest-action@master
219
         uses: Noelware/docker-manifest-action@master
218
         with:
220
         with:
219
           base-image: ${{ secrets.DOCKER_IMAGE }}:${{ env.MAJOR_TAG }}
221
           base-image: ${{ secrets.DOCKER_IMAGE }}:${{ env.MAJOR_TAG }}
@@ -221,14 +223,7 @@ jobs:
221
           push: true
223
           push: true
222
 
224
 
223
       # manifest for :latest tag
225
       # manifest for :latest tag
224
-      - name: Create and push manifest
225
-        uses: Noelware/docker-manifest-action@master
226
-        with:
227
-          base-image: ${{ secrets.DOCKER_IMAGE }}:${{ github.ref_name }}
228
-          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
229
-          push: true
230
-
231
-      - name: Create and push manifest
226
+      - name: Create and push manifest (:latest)
232
         uses: Noelware/docker-manifest-action@master
227
         uses: Noelware/docker-manifest-action@master
233
         with:
228
         with:
234
           base-image: ${{ secrets.DOCKER_IMAGE }}:${{ env.LATEST_TAG }}
229
           base-image: ${{ secrets.DOCKER_IMAGE }}:${{ env.LATEST_TAG }}

+ 1 - 1
README.md

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

+ 5 - 4
docker/Dockerfile

@@ -1,13 +1,14 @@
1
 FROM busybox:stable
1
 FROM busybox:stable
2
 
2
 
3
-ARG S6_OVERLAY_VERSION=3.1.0.1
3
+ARG S6_OVERLAY_VERSION=3.1.1.2
4
+ARG S6_ARCH=x86_64
4
 ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz /tmp
5
 ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz /tmp
5
-ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-x86_64.tar.xz /tmp
6
+ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-${S6_ARCH}.tar.xz /tmp
6
 RUN \
7
 RUN \
7
   tar -C / -Jxpf /tmp/s6-overlay-noarch.tar.xz && \
8
   tar -C / -Jxpf /tmp/s6-overlay-noarch.tar.xz && \
8
-  tar -C / -Jxpf /tmp/s6-overlay-x86_64.tar.xz && \
9
+  tar -C / -Jxpf /tmp/s6-overlay-${S6_ARCH}.tar.xz && \
9
   rm /tmp/s6-overlay*.tar.xz
10
   rm /tmp/s6-overlay*.tar.xz
10
-  
11
+
11
 COPY rootfs /
12
 COPY rootfs /
12
 
13
 
13
 ENV RELAY relay.example.com
14
 ENV RELAY relay.example.com