X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=.github%2Fworkflows%2Fdocker.yml;h=e7be01f51afc1cdc096940d675d5509f238161f2;hb=ab14f0e0dca878dbaccc8f6a895a68e4269c9873;hp=7afe641b308562fa8ccffbb3e581bc7335aa7c45;hpb=636d73c58866ed235c207719e41fdde3c2d6c969;p=github%2FChocobozzz%2FPeerTube.git diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 7afe641b3..e7be01f51 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -15,7 +15,7 @@ jobs: matrix: ${{ steps.set-matrix.outputs.matrix }} steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: ref: master - name: Set matrix for build @@ -25,11 +25,11 @@ jobs: git fetch --force --tags one="{ \"file\": \"./support/docker/production/Dockerfile.bullseye\", \"ref\": \"develop\", \"tags\": \"chocobozzz/peertube:develop-bullseye\" }" - two="{ \"file\": \"./support/docker/production/Dockerfile.buster\", \"ref\": \"master\", \"tags\": \"chocobozzz/peertube:production-buster,chocobozzz/peertube:$(git describe --abbrev=0)-buster\" }" + two="{ \"file\": \"./support/docker/production/Dockerfile.bullseye\", \"ref\": \"master\", \"tags\": \"chocobozzz/peertube:production-bullseye,chocobozzz/peertube:$(git describe --abbrev=0)-bullseye\" }" three="{ \"file\": \"./support/docker/production/Dockerfile.nginx\", \"ref\": \"master\", \"tags\": \"chocobozzz/peertube-webserver:latest\" }" matrix="[$one,$two,$three]" - echo ::set-output name=matrix::{\"include\":$(echo $matrix)} + echo "matrix={\"include\":$matrix}" >> $GITHUB_OUTPUT docker: runs-on: ubuntu-latest @@ -40,28 +40,30 @@ jobs: matrix: ${{ fromJson(needs.generate-matrix.outputs.matrix) }} fail-fast: false + name: ${{ matrix.tags }} + steps: - name: Set up QEMU - uses: docker/setup-qemu-action@v1 + uses: docker/setup-qemu-action@v2 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v2 - name: Login to DockerHub - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Checkout develop - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: ref: ${{ matrix.ref }} - name: Docker build - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v3 with: context: '.' platforms: linux/amd64,linux/arm64