diff options
author | Chocobozzz <me@florianbigard.com> | 2023-03-22 09:14:20 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2023-03-22 09:14:20 +0100 |
commit | d6fcbe8d6d72da2f15506765a854da531e769645 (patch) | |
tree | 558d65ff08249756fd1a337256cf6ad5177f41e3 /.github/workflows/docker.yml | |
parent | ae0e4fdbd143966b870678721b60f4fad7c3cbe9 (diff) | |
download | PeerTube-d6fcbe8d6d72da2f15506765a854da531e769645.tar.gz PeerTube-d6fcbe8d6d72da2f15506765a854da531e769645.tar.zst PeerTube-d6fcbe8d6d72da2f15506765a854da531e769645.zip |
Try to fix docker build timeout
Diffstat (limited to '.github/workflows/docker.yml')
-rw-r--r-- | .github/workflows/docker.yml | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index e7be01f51..e5dfcc274 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml | |||
@@ -24,9 +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\" }" | 27 | one="{ \"file\": \"./support/docker/production/Dockerfile.bullseye\", \"ref\": \"develop\", \"tags\": \"chocobozzz/peertube:develop-bullseye\", \"platforms\": \"linux/amd64\" }" |
28 | two="{ \"file\": \"./support/docker/production/Dockerfile.bullseye\", \"ref\": \"master\", \"tags\": \"chocobozzz/peertube:production-bullseye,chocobozzz/peertube:$(git describe --abbrev=0)-bullseye\" }" | 28 | one="{ \"file\": \"./support/docker/production/Dockerfile.bullseye\", \"ref\": \"develop\", \"tags\": \"chocobozzz/peertube:develop-bullseye\", \"platforms\": \"linux/arm64\" }" |
29 | three="{ \"file\": \"./support/docker/production/Dockerfile.nginx\", \"ref\": \"master\", \"tags\": \"chocobozzz/peertube-webserver:latest\" }" | 29 | two="{ \"file\": \"./support/docker/production/Dockerfile.bullseye\", \"ref\": \"master\", \"tags\": \"chocobozzz/peertube:production-bullseye,chocobozzz/peertube:$(git describe --abbrev=0)-bullseye\", \"platforms\": \"linux/amd64\" }" |
30 | two="{ \"file\": \"./support/docker/production/Dockerfile.bullseye\", \"ref\": \"master\", \"tags\": \"chocobozzz/peertube:production-bullseye,chocobozzz/peertube:$(git describe --abbrev=0)-bullseye\", \"platforms\": \"linux/arm64\" }" | ||
31 | three="{ \"file\": \"./support/docker/production/Dockerfile.nginx\", \"ref\": \"master\", \"tags\": \"chocobozzz/peertube-webserver:latest\", \"platforms\": \"linux/amd64,linux/arm64\" }" | ||
30 | 32 | ||
31 | matrix="[$one,$two,$three]" | 33 | matrix="[$one,$two,$three]" |
32 | echo "matrix={\"include\":$matrix}" >> $GITHUB_OUTPUT | 34 | echo "matrix={\"include\":$matrix}" >> $GITHUB_OUTPUT |
@@ -66,7 +68,7 @@ jobs: | |||
66 | uses: docker/build-push-action@v3 | 68 | uses: docker/build-push-action@v3 |
67 | with: | 69 | with: |
68 | context: '.' | 70 | context: '.' |
69 | platforms: linux/amd64,linux/arm64 | 71 | platforms: ${{ matrix.platforms }} |
70 | push: true | 72 | push: true |
71 | file: ${{ matrix.file }} | 73 | file: ${{ matrix.file }} |
72 | tags: ${{ matrix.tags }} | 74 | tags: ${{ matrix.tags }} |