From df5c416532e5c6e9fbce2263a572d8090d4f2a36 Mon Sep 17 00:00:00 2001 From: William-Gao1 Date: Wed, 21 Sep 2022 17:19:58 -0400 Subject: [PATCH 1/6] test deploy to prod --- .github/workflows/deploy.yml | 32 ---------------------- .github/workflows/gcp_deploy.yml | 4 +-- .github/workflows/gcp_deploy_prod.yml | 38 +++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 35 deletions(-) delete mode 100644 .github/workflows/deploy.yml create mode 100644 .github/workflows/gcp_deploy_prod.yml diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml deleted file mode 100644 index eaf91ea..0000000 --- a/.github/workflows/deploy.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: dev_deploy -on: - push: - branches: - - dev - -jobs: - deploy: - name: deploy - runs-on: [self-hosted, parallel] - steps: - - uses: actions/checkout@v3 - - name: Docker Login - shell: bash - env: - DOCKER_USERNAME: ${{ secrets.UWPATH_DOCKER_USER }} - DOCKER_PASSWORD: ${{ secrets.UWPATH_DOCKER_PASSWORD }} - run: docker login --username "$DOCKER_USERNAME" --password "$DOCKER_PASSWORD" - - name: Build Image - run: | - docker compose build - docker image ls - - name: Push to Registry - run: | - docker tag $(docker images uwpath_backend --format "{{.ID}}") uwpathdocker/uwpath_backend:int - docker push uwpathdocker/uwpath_backend:int - - name: Clean Env - if: always() - run: | - docker system prune --volumes -af - docker logout - diff --git a/.github/workflows/gcp_deploy.yml b/.github/workflows/gcp_deploy.yml index defb5e0..a64862c 100644 --- a/.github/workflows/gcp_deploy.yml +++ b/.github/workflows/gcp_deploy.yml @@ -13,7 +13,7 @@ jobs: - name: G-Cloud Authenticate env: SERVICE_CREDENTIALS: ${{ secrets.GCP_SERVICE_CREDENTIALS_DEV }} - SERVICE_ACCOUNT: ${{ secrets.GCP_SERVICE_ACCOUNT_DEV}} + SERVICE_ACCOUNT: ${{ secrets.GCP_SERVICE_ACCOUNT_DEV }} PROJECT_ID: ${{ secrets.GCP_PROJECT_ID_DEV }} run: |- echo "$SERVICE_CREDENTIALS" > ./credentials.json @@ -36,5 +36,3 @@ jobs: - name: Clean Env if: always() run: docker system prune --volumes -af - - diff --git a/.github/workflows/gcp_deploy_prod.yml b/.github/workflows/gcp_deploy_prod.yml new file mode 100644 index 0000000..8416509 --- /dev/null +++ b/.github/workflows/gcp_deploy_prod.yml @@ -0,0 +1,38 @@ +name: gcp_deploy_backend_prod +on: + push: + branches: + - pipeline-setup-prod + +jobs: + deploy: + name: deploy + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: G-Cloud Authenticate + env: + SERVICE_CREDENTIALS: ${{ secrets.GCP_SERVICE_CREDENTIALS_PROD }} + SERVICE_ACCOUNT: ${{ secrets.GCP_SERVICE_ACCOUNT_PROD}} + PROJECT_ID: ${{ secrets.GCP_PROJECT_ID_PROD }} + run: |- + echo "$SERVICE_CREDENTIALS" > ./credentials.json + gcloud auth activate-service-account "$SERVICE_ACCOUNT" --key-file=./credentials.json --project="$PROJECT_ID" + gcloud auth configure-docker us-central1-docker.pkg.dev --quiet + - name: Docker Build + env: + IMAGE_NAME: ${{ secrets.GCP_IMAGE_NAME_PROD }} + run: docker build -t "$IMAGE_NAME" . + - name: Push to Container Registry + env: + IMAGE_NAME: ${{ secrets.GCP_IMAGE_NAME_PROD }} + run: sudo -u $USER docker push "$IMAGE_NAME" + - name: Deploy to Cloud Run + env: + IMAGE_NAME: ${{ secrets.GCP_IMAGE_NAME_PROD }} + PROJECT_ID: ${{ secrets.GCP_PROJECT_ID_PROD }} + run: gcloud run deploy uwpath-backend-dev --image="$IMAGE_NAME" --project="$PROJECT_ID" --region=us-central1 + + - name: Clean Env + if: always() + run: docker system prune --volumes -af From 67ae2fb028cab62bcfd3d37b7ef22e730e32f5b5 Mon Sep 17 00:00:00 2001 From: William-Gao1 Date: Wed, 21 Sep 2022 17:22:56 -0400 Subject: [PATCH 2/6] typo --- .github/workflows/gcp_deploy.yml | 2 +- uwpath_backend/prod_settings.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gcp_deploy.yml b/.github/workflows/gcp_deploy.yml index a64862c..c674b5c 100644 --- a/.github/workflows/gcp_deploy.yml +++ b/.github/workflows/gcp_deploy.yml @@ -31,7 +31,7 @@ jobs: env: IMAGE_NAME: ${{ secrets.GCP_IMAGE_NAME_DEV }} PROJECT_ID: ${{ secrets.GCP_PROJECT_ID_DEV}} - run: gcloud run deploy uwpath-backend-dev --image="$IMAGE_NAME" --project="$PROJECT_ID" --region=us-central1 + run: gcloud run deploy uwpath-backend-prod --image="$IMAGE_NAME" --project="$PROJECT_ID" --region=us-central1 - name: Clean Env if: always() diff --git a/uwpath_backend/prod_settings.py b/uwpath_backend/prod_settings.py index a286052..693a135 100644 --- a/uwpath_backend/prod_settings.py +++ b/uwpath_backend/prod_settings.py @@ -40,7 +40,7 @@ # SECURITY WARNING: don't run with debug turned on in production! DEBUG = False -ALLOWED_HOSTS = ['api.uwpath.com'] +ALLOWED_HOSTS = ['api.uwpath.com', 'uwpath-backend-prod-qtsbtvgvna-uc.a.run.app'] # Application definition From 34d3525b63085b34d54ae364c56a96503341e2e1 Mon Sep 17 00:00:00 2001 From: William-Gao1 Date: Wed, 21 Sep 2022 17:27:03 -0400 Subject: [PATCH 3/6] typo again --- .github/workflows/gcp_deploy.yml | 2 +- .github/workflows/gcp_deploy_prod.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gcp_deploy.yml b/.github/workflows/gcp_deploy.yml index c674b5c..a64862c 100644 --- a/.github/workflows/gcp_deploy.yml +++ b/.github/workflows/gcp_deploy.yml @@ -31,7 +31,7 @@ jobs: env: IMAGE_NAME: ${{ secrets.GCP_IMAGE_NAME_DEV }} PROJECT_ID: ${{ secrets.GCP_PROJECT_ID_DEV}} - run: gcloud run deploy uwpath-backend-prod --image="$IMAGE_NAME" --project="$PROJECT_ID" --region=us-central1 + run: gcloud run deploy uwpath-backend-dev --image="$IMAGE_NAME" --project="$PROJECT_ID" --region=us-central1 - name: Clean Env if: always() diff --git a/.github/workflows/gcp_deploy_prod.yml b/.github/workflows/gcp_deploy_prod.yml index 8416509..2064e0c 100644 --- a/.github/workflows/gcp_deploy_prod.yml +++ b/.github/workflows/gcp_deploy_prod.yml @@ -31,7 +31,7 @@ jobs: env: IMAGE_NAME: ${{ secrets.GCP_IMAGE_NAME_PROD }} PROJECT_ID: ${{ secrets.GCP_PROJECT_ID_PROD }} - run: gcloud run deploy uwpath-backend-dev --image="$IMAGE_NAME" --project="$PROJECT_ID" --region=us-central1 + run: gcloud run deploy uwpath-backend-prod --image="$IMAGE_NAME" --project="$PROJECT_ID" --region=us-central1 - name: Clean Env if: always() From 519ba733b2cc9048cb6c47af4fcd002f23c052b2 Mon Sep 17 00:00:00 2001 From: William-Gao1 Date: Thu, 22 Sep 2022 23:15:47 -0400 Subject: [PATCH 4/6] added frontend to cors --- uwpath_backend/prod_settings.py | 1 + 1 file changed, 1 insertion(+) diff --git a/uwpath_backend/prod_settings.py b/uwpath_backend/prod_settings.py index 693a135..58ec302 100644 --- a/uwpath_backend/prod_settings.py +++ b/uwpath_backend/prod_settings.py @@ -173,4 +173,5 @@ CORS_ORIGIN_WHITELIST = [ 'https://uwpath.com', + 'https://uwpath-frontend-prod-qtsbtvgvna-uc.a.run.app' ] \ No newline at end of file From f15aeebbaf6b195271d01a330ad9ce9c050226bb Mon Sep 17 00:00:00 2001 From: William-Gao1 Date: Thu, 22 Sep 2022 23:30:24 -0400 Subject: [PATCH 5/6] changed branch --- .github/workflows/gcp_deploy_prod.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gcp_deploy_prod.yml b/.github/workflows/gcp_deploy_prod.yml index 2064e0c..8c5d634 100644 --- a/.github/workflows/gcp_deploy_prod.yml +++ b/.github/workflows/gcp_deploy_prod.yml @@ -2,7 +2,7 @@ name: gcp_deploy_backend_prod on: push: branches: - - pipeline-setup-prod + - master jobs: deploy: @@ -13,7 +13,7 @@ jobs: - name: G-Cloud Authenticate env: SERVICE_CREDENTIALS: ${{ secrets.GCP_SERVICE_CREDENTIALS_PROD }} - SERVICE_ACCOUNT: ${{ secrets.GCP_SERVICE_ACCOUNT_PROD}} + SERVICE_ACCOUNT: ${{ secrets.GCP_SERVICE_ACCOUNT_PROD }} PROJECT_ID: ${{ secrets.GCP_PROJECT_ID_PROD }} run: |- echo "$SERVICE_CREDENTIALS" > ./credentials.json From d23511db1a2b91e95f8036812d762242171a3b88 Mon Sep 17 00:00:00 2001 From: William-Gao1 Date: Sat, 24 Sep 2022 15:29:47 -0400 Subject: [PATCH 6/6] build on github runner --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5eb4ebc..1cebded 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,7 +4,7 @@ on: pull_request jobs: build: name: build - runs-on: [self-hosted, parallel] + runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - name: Docker Build