diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index adbb372062..7b5d0d8420 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -280,11 +280,20 @@ jobs: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} if: github.event_name != 'pull_request' + - name: Login to GitHub Container Registry + uses: docker/login-action@v1 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} + if: github.event_name != 'pull_request' - name: Docker meta id: meta uses: docker/metadata-action@v3 with: - images: nginx/nginx-ingress + images: | + nginx/nginx-ingress + ghcr.io/nginxinc/kubernetes-ingress flavor: suffix=${{ matrix.image != 'debian' && '-' || '' }}${{ matrix.image != 'debian' && matrix.image != 'opentracing' && matrix.image || '' }}${{ matrix.image == 'opentracing' && 'ot' || '' }},onlatest=true tags: | type=edge diff --git a/.github/workflows/update-docker-images.yml b/.github/workflows/update-docker-images.yml index 77784a9c9a..5e7fa9e16b 100644 --- a/.github/workflows/update-docker-images.yml +++ b/.github/workflows/update-docker-images.yml @@ -171,6 +171,13 @@ jobs: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} if: ${{ matrix.needs-updating == 'true' }} + - name: Login to GitHub Container Registry + uses: docker/login-action@v1 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} + if: ${{ matrix.needs-updating == 'true' }} - name: Get short tag id: tag run: | @@ -182,7 +189,9 @@ jobs: id: meta uses: docker/metadata-action@v3 with: - images: nginx/nginx-ingress + images: | + nginx/nginx-ingress + ghcr.io/nginxinc/kubernetes-ingress flavor: | latest=true suffix=${{ matrix.image != 'debian' && '-' || '' }}${{ matrix.image != 'debian' && matrix.image != 'opentracing' && matrix.image || '' }}${{ matrix.image == 'opentracing' && 'ot' || '' }},onlatest=true