diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index be99b80..afca91c 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -24,9 +24,9 @@ jobs: - name: Checkout uses: actions/checkout@v3 - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Cache Docker layers uses: actions/cache@v3 with: @@ -35,7 +35,7 @@ jobs: restore-keys: | all-buildx- - name: Build - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v5 with: context: . file: ./Dockerfile @@ -55,9 +55,9 @@ jobs: - name: Checkout uses: actions/checkout@v3 - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Cache Docker layers uses: actions/cache@v3 with: @@ -66,10 +66,16 @@ jobs: restore-keys: | all-buildx- - name: Login to DockerHub - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Login to GitHub Container Registry + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Get tags list id: tags run: | @@ -80,12 +86,12 @@ jobs: [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//') # Use Docker `latest` tag convention - [ "$VERSION" == "master" ] && TAGS=$IMAGE_NAME:latest - [ "$VERSION" != "master" ] && TAGS=$IMAGE_NAME:$VERSION,$IMAGE_NAME:latest + [ "$VERSION" == "master" ] && TAGS=$IMAGE_NAME:latest,ghcr.io/$IMAGE_NAME:latest + [ "$VERSION" != "master" ] && TAGS=$IMAGE_NAME:$VERSION,$IMAGE_NAME:latest,ghcr.io/$IMAGE_NAME:$VERSION,ghcr.io/$IMAGE_NAME:latest echo TAGS=$TAGS echo "tags=$TAGS" >> $GITHUB_OUTPUT - name: Build and push - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v5 with: context: . file: ./Dockerfile diff --git a/.github/workflows/pull-request-publish.yml b/.github/workflows/pull-request-publish.yml index 8a84ed9..9d0b018 100644 --- a/.github/workflows/pull-request-publish.yml +++ b/.github/workflows/pull-request-publish.yml @@ -52,9 +52,9 @@ jobs: run: | echo "sha_short=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Cache Docker layers uses: actions/cache@v3 with: @@ -63,7 +63,7 @@ jobs: restore-keys: | all-buildx- - name: Build - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v5 with: context: . file: ./Dockerfile @@ -88,9 +88,9 @@ jobs: run: | echo "sha_short=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Cache Docker layers uses: actions/cache@v3 with: @@ -99,18 +99,24 @@ jobs: restore-keys: | all-buildx- - name: Login to DockerHub - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Login to GitHub Container Registry + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Get tags list id: tags run: | - TAGS=$IMAGE_NAME:PR-${{ github.event.issue.number }} + TAGS=$IMAGE_NAME:PR-${{ github.event.issue.number }},ghcr.io/$IMAGE_NAME:PR-${{ github.event.issue.number }} echo TAGS=$TAGS echo "tags=$TAGS" >> $GITHUB_OUTPUT - name: Build and push - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v5 with: context: . file: ./Dockerfile diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 923940c..a3beac6 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -21,9 +21,9 @@ jobs: - name: Checkout uses: actions/checkout@v3 - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Cache Docker layers uses: actions/cache@v3 with: @@ -32,7 +32,7 @@ jobs: restore-keys: | ${{ matrix.architecture }}-buildx- - name: Build - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v5 with: context: . file: ./Dockerfile