diff options
Diffstat (limited to '.github/workflows/docker.yml')
-rw-r--r-- | .github/workflows/docker.yml | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index f6af8484a..e7be01f51 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml | |||
@@ -24,13 +24,11 @@ jobs: | |||
24 | # FIXME: https://github.com/actions/checkout/issues/290 | 24 | # FIXME: https://github.com/actions/checkout/issues/290 |
25 | git fetch --force --tags | 25 | git fetch --force --tags |
26 | 26 | ||
27 | one="{ \"file\": \"./support/docker/production/Dockerfile.bullseye\", \"ref\": \"develop\", \"tags\": \"chocobozzz/peertube:develop-bullseye\", \"platforms\": \"linux/amd64\" }" | 27 | one="{ \"file\": \"./support/docker/production/Dockerfile.bullseye\", \"ref\": \"develop\", \"tags\": \"chocobozzz/peertube:develop-bullseye\" }" |
28 | two="{ \"file\": \"./support/docker/production/Dockerfile.bullseye\", \"ref\": \"develop\", \"tags\": \"chocobozzz/peertube:develop-bullseye\", \"platforms\": \"linux/arm64\" }" | 28 | two="{ \"file\": \"./support/docker/production/Dockerfile.bullseye\", \"ref\": \"master\", \"tags\": \"chocobozzz/peertube:production-bullseye,chocobozzz/peertube:$(git describe --abbrev=0)-bullseye\" }" |
29 | three="{ \"file\": \"./support/docker/production/Dockerfile.bullseye\", \"ref\": \"master\", \"tags\": \"chocobozzz/peertube:production-bullseye,chocobozzz/peertube:$(git describe --abbrev=0)-bullseye\", \"platforms\": \"linux/amd64\" }" | 29 | three="{ \"file\": \"./support/docker/production/Dockerfile.nginx\", \"ref\": \"master\", \"tags\": \"chocobozzz/peertube-webserver:latest\" }" |
30 | four="{ \"file\": \"./support/docker/production/Dockerfile.bullseye\", \"ref\": \"master\", \"tags\": \"chocobozzz/peertube:production-bullseye,chocobozzz/peertube:$(git describe --abbrev=0)-bullseye\", \"platforms\": \"linux/arm64\" }" | ||
31 | five="{ \"file\": \"./support/docker/production/Dockerfile.nginx\", \"ref\": \"master\", \"tags\": \"chocobozzz/peertube-webserver:latest\", \"platforms\": \"linux/amd64,linux/arm64\" }" | ||
32 | 30 | ||
33 | matrix="[$one,$two,$three,$four,$five]" | 31 | matrix="[$one,$two,$three]" |
34 | echo "matrix={\"include\":$matrix}" >> $GITHUB_OUTPUT | 32 | echo "matrix={\"include\":$matrix}" >> $GITHUB_OUTPUT |
35 | 33 | ||
36 | docker: | 34 | docker: |
@@ -68,7 +66,7 @@ jobs: | |||
68 | uses: docker/build-push-action@v3 | 66 | uses: docker/build-push-action@v3 |
69 | with: | 67 | with: |
70 | context: '.' | 68 | context: '.' |
71 | platforms: ${{ matrix.platforms }} | 69 | platforms: linux/amd64,linux/arm64 |
72 | push: true | 70 | push: true |
73 | file: ${{ matrix.file }} | 71 | file: ${{ matrix.file }} |
74 | tags: ${{ matrix.tags }} | 72 | tags: ${{ matrix.tags }} |