diff --git a/.dockerignore b/.dockerignore index 85585d7c..d8d12e0f 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,2 +1,5 @@ .ruby-version .bundle + +# Ignore generated credentials from google-github-actions/auth +gha-creds-*.json diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 75cf50b1..9f0b89b9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,6 +12,7 @@ env: NODE_VERSION: 16.x RAILS_ENV: test TEXTELLENT_AUTH_CODE: ${{ secrets.TEXTELLENT_AUTH_CODE }} + GCP_REPO: us-west2-docker.pkg.dev/askdarcel-184805/sheltertech/askdarcel-api DOCKER_REPO: sheltertechsf/askdarcel-api jobs: @@ -71,6 +72,14 @@ jobs: - uses: actions/checkout@v2 - uses: docker/setup-qemu-action@v1 - uses: docker/setup-buildx-action@v1 + - uses: google-github-actions/auth@v2 + with: + credentials_json: ${{ secrets.GCP_ARTIFACT_REGISTRY_KEY }} + - uses: docker/login-action@v3 + with: + registry: us-west2-docker.pkg.dev + username: _json_key + password: ${{ secrets.GCP_ARTIFACT_REGISTRY_KEY }} - uses: docker/login-action@v1 with: username: ${{ secrets.DOCKERHUB_USERNAME }} @@ -78,5 +87,7 @@ jobs: - uses: docker/build-push-action@v2 with: push: true - tags: ${{ env.DOCKER_REPO }}:latest + tags: | + ${{ env.DOCKER_REPO }}:latest + ${{ env.GCP_REPO }}:latest - run: echo ${{ steps.docker_build.outputs.digest }} \ No newline at end of file diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 90ccf5e6..98316ba3 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -7,6 +7,7 @@ on: - '*' env: + GCP_REPO: us-west2-docker.pkg.dev/askdarcel-184805/sheltertech/askdarcel-api DOCKER_REPO: sheltertechsf/askdarcel-api jobs: @@ -23,15 +24,27 @@ jobs: prefix= suffix= images: | + ${{ env.GCP_REPO }} ${{ env.DOCKER_REPO }} tags: | type=semver,pattern={{version}} - uses: docker/setup-qemu-action@v1 - uses: docker/setup-buildx-action@v1 + - uses: google-github-actions/auth@v2 + # Login to google registry + with: + credentials_json: ${{ secrets.GCP_ARTIFACT_REGISTRY_KEY }} + # Authenticate with Google Cloud + - uses: docker/login-action@v3 + with: + registry: us-west2-docker.pkg.dev + username: _json_key + password: ${{ secrets.GCP_ARTIFACT_REGISTRY_KEY }} - uses: docker/login-action@v1 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_PASSWORD }} + # Build and push to both registries - uses: docker/build-push-action@v2 with: push: true