diff --git a/.github/workflows/docker_build.yml b/.github/workflows/docker_build.yml index e02ddb79..05cc419c 100644 --- a/.github/workflows/docker_build.yml +++ b/.github/workflows/docker_build.yml @@ -14,7 +14,7 @@ jobs: - name: Docker meta id: docker_meta - uses: crazy-max/ghaction-docker-meta@v2 + uses: docker/metadata-action@v3 with: images: | ghcr.io/hydrusnetwork/hydrus @@ -26,23 +26,23 @@ jobs: org.opencontainers.image.vendor=hydrusnetwork - 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 with: buildkitd-flags: "--debug" - name: Login to GHCR if: github.event_name != 'pull_request' - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: registry: ghcr.io username: ${{ secrets.GHCR_USERNAME }} password: ${{ secrets.GHCR_TOKEN }} - name: Build - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v3 with: context: . push: ${{ github.event_name != 'pull_request' }} @@ -60,10 +60,10 @@ jobs: - name: Docker meta id: docker_meta - uses: crazy-max/ghaction-docker-meta@v2 + uses: docker/metadata-action@v3 with: images: | - ghcr.io/hydrusnetwork/hydrus + ghcr.io/${{ github.repository }} tags: | type=ref,event=tag,prefix=server- type=raw,enable=true,prefix=,suffix=,value=server @@ -75,23 +75,21 @@ jobs: org.opencontainers.image.vendor=hydrusnetwork - 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 - with: - buildkitd-flags: "--debug" + uses: docker/setup-buildx-action@v2 - name: Login to GHCR if: github.event_name != 'pull_request' - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: registry: ghcr.io username: ${{ secrets.GHCR_USERNAME }} password: ${{ secrets.GHCR_TOKEN }} - name: Build - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v3 with: context: . push: ${{ github.event_name != 'pull_request' }} diff --git a/static/build_files/docker/docker_build.yml b/static/build_files/docker/docker_build.yml index d39b74fa..05cc419c 100644 --- a/static/build_files/docker/docker_build.yml +++ b/static/build_files/docker/docker_build.yml @@ -10,11 +10,11 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v3 - name: Docker meta id: docker_meta - uses: crazy-max/ghaction-docker-meta@v2 + uses: docker/metadata-action@v3 with: images: | ghcr.io/hydrusnetwork/hydrus @@ -26,23 +26,23 @@ jobs: org.opencontainers.image.vendor=hydrusnetwork - 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 with: buildkitd-flags: "--debug" - name: Login to GHCR if: github.event_name != 'pull_request' - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: registry: ghcr.io username: ${{ secrets.GHCR_USERNAME }} password: ${{ secrets.GHCR_TOKEN }} - name: Build - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v3 with: context: . push: ${{ github.event_name != 'pull_request' }} @@ -56,14 +56,14 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v3 - name: Docker meta id: docker_meta - uses: crazy-max/ghaction-docker-meta@v2 + uses: docker/metadata-action@v3 with: images: | - ghcr.io/hydrusnetwork/hydrus + ghcr.io/${{ github.repository }} tags: | type=ref,event=tag,prefix=server- type=raw,enable=true,prefix=,suffix=,value=server @@ -75,23 +75,21 @@ jobs: org.opencontainers.image.vendor=hydrusnetwork - 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 - with: - buildkitd-flags: "--debug" + uses: docker/setup-buildx-action@v2 - name: Login to GHCR if: github.event_name != 'pull_request' - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: registry: ghcr.io username: ${{ secrets.GHCR_USERNAME }} password: ${{ secrets.GHCR_TOKEN }} - name: Build - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v3 with: context: . push: ${{ github.event_name != 'pull_request' }}