diff options
| author | Chocobozzz <me@florianbigard.com> | 2023-03-23 08:57:01 +0100 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2023-03-23 08:57:01 +0100 |
| commit | 80d7d180a368dc966bba383f3117ed131f5e0d42 (patch) | |
| tree | 0e36507fdfe7d104440a92932102167f389cca3c /.github | |
| parent | b070b2e5e8334c44fa9868bfe281287c6a84350e (diff) | |
| parent | 43fe59ae863d1e15d77c74711304f26916751ca3 (diff) | |
| download | PeerTube-80d7d180a368dc966bba383f3117ed131f5e0d42.tar.gz PeerTube-80d7d180a368dc966bba383f3117ed131f5e0d42.tar.zst PeerTube-80d7d180a368dc966bba383f3117ed131f5e0d42.zip | |
Merge branch 'release/5.1.0' into develop
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/docker.yml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index e5dfcc274..f6af8484a 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml | |||
| @@ -25,12 +25,12 @@ jobs: | |||
| 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\", \"platforms\": \"linux/amd64\" }" |
| 28 | one="{ \"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\": \"develop\", \"tags\": \"chocobozzz/peertube:develop-bullseye\", \"platforms\": \"linux/arm64\" }" |
| 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\" }" | 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\" }" |
| 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\" }" | 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 | three="{ \"file\": \"./support/docker/production/Dockerfile.nginx\", \"ref\": \"master\", \"tags\": \"chocobozzz/peertube-webserver:latest\", \"platforms\": \"linux/amd64,linux/arm64\" }" | 31 | five="{ \"file\": \"./support/docker/production/Dockerfile.nginx\", \"ref\": \"master\", \"tags\": \"chocobozzz/peertube-webserver:latest\", \"platforms\": \"linux/amd64,linux/arm64\" }" |
| 32 | 32 | ||
| 33 | matrix="[$one,$two,$three]" | 33 | matrix="[$one,$two,$three,$four,$five]" |
| 34 | echo "matrix={\"include\":$matrix}" >> $GITHUB_OUTPUT | 34 | echo "matrix={\"include\":$matrix}" >> $GITHUB_OUTPUT |
| 35 | 35 | ||
| 36 | docker: | 36 | docker: |