Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ on:
env:
NODE_VERSION: 18.x
GCP_REPO: us-west2-docker.pkg.dev/askdarcel-184805/sheltertech/askdarcel-web
DOCKERHUB_REPO: sheltertechsf/askdarcel-web

jobs:
lint:
Expand Down Expand Up @@ -119,25 +118,19 @@ jobs:
with:
credentials_json: ${{ secrets.GCP_SA_KEY }}

# Login to both registries
# Login to GCP Artifact Registry
- uses: docker/login-action@v3
with:
registry: us-west2-docker.pkg.dev
username: _json_key
password: ${{ secrets.GCP_SA_KEY }}

- uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}

# Build and push to both registries
# Build and push
- uses: docker/build-push-action@v6
with:
push: true
context: .
tags: |
${{ env.GCP_REPO }}:latest
${{ env.DOCKERHUB_REPO }}:latest

- run: echo ${{ steps.docker_build.outputs.digest }}
11 changes: 2 additions & 9 deletions .github/workflows/publish-qa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ on:
env:
NODE_VERSION: 18.x
GCP_REPO: us-west2-docker.pkg.dev/askdarcel-184805/sheltertech/askdarcel-web
DOCKERHUB_REPO: sheltertechsf/askdarcel-web

jobs:
build:
Expand Down Expand Up @@ -44,25 +43,19 @@ jobs:
with:
credentials_json: ${{ secrets.GCP_SA_KEY }}

# Login to both registries
# Login to GCP Artifact Registry
- uses: docker/login-action@v3
with:
registry: us-west2-docker.pkg.dev
username: _json_key
password: ${{ secrets.GCP_SA_KEY }}

- uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}

# Build and push to both registries
# Build and push
- uses: docker/build-push-action@v6
with:
push: true
context: .
tags: |
${{ env.GCP_REPO }}:qa-one
${{ env.DOCKERHUB_REPO }}:qa-one

- run: echo ${{ steps.docker_build.outputs.digest }}
13 changes: 3 additions & 10 deletions .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ on:
env:
NODE_VERSION: 18.x
GCP_REPO: us-west2-docker.pkg.dev/askdarcel-184805/sheltertech/askdarcel-web
DOCKERHUB_REPO: sheltertechsf/askdarcel-web

jobs:
build:
Expand Down Expand Up @@ -38,7 +37,7 @@ jobs:
- uses: docker/setup-qemu-action@v3
- uses: docker/setup-buildx-action@v3

# Create metadata for both registries
# Create image metadata
- name: Docker meta
id: meta
uses: docker/metadata-action@v5
Expand All @@ -49,7 +48,6 @@ jobs:
suffix=
images: |
${{ env.GCP_REPO }}
${{ env.DOCKERHUB_REPO }}
tags: |
type=semver,pattern={{version}}

Expand All @@ -58,19 +56,14 @@ jobs:
with:
credentials_json: ${{ secrets.GCP_SA_KEY }}

# Login to both registries
# Login to GCP Artifact Registry
- uses: docker/login-action@v3
with:
registry: us-west2-docker.pkg.dev
username: _json_key
password: ${{ secrets.GCP_SA_KEY }}

- uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}

# Build and push to both registries
# Build and push
- uses: docker/build-push-action@v6
with:
push: true
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ services:
retries: 5

api:
image: sheltertechsf/askdarcel-api:latest
image: us-west2-docker.pkg.dev/askdarcel-184805/sheltertech/askdarcel-api:latest
networks: [askdarcel]
ports: ["3000:3000"]
depends_on: [db]
Expand All @@ -33,7 +33,7 @@ services:
# ALGOLIA_INDEX_PREFIX:

api-go:
image: sheltertechsf/sheltertech-go:latest
image: us-west2-docker.pkg.dev/askdarcel-184805/sheltertech/sheltertech-go:latest
networks: [askdarcel]
ports: ["3001:3001"]
depends_on:
Expand Down
Loading