From 7bc2ac12d5fc7a67f7df38926567ab886dd20891 Mon Sep 17 00:00:00 2001 From: WeeSooJun Date: Sat, 6 Apr 2024 11:16:55 +0800 Subject: [PATCH 01/12] Trigger build --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index e329115..997434e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,3 +17,4 @@ USER user WORKDIR /home/user CMD ["sh","/home/user/start.sh"] + From 134fc3897d60d0f8fa1ee2e7a97bca925dd2db3d Mon Sep 17 00:00:00 2001 From: WeeSooJun Date: Sat, 6 Apr 2024 11:17:08 +0800 Subject: [PATCH 02/12] Another change --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 997434e..e329115 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,4 +17,3 @@ USER user WORKDIR /home/user CMD ["sh","/home/user/start.sh"] - From b56dcb780694fe6c54b68090d179bb5362155ea2 Mon Sep 17 00:00:00 2001 From: WeeSooJun Date: Sat, 6 Apr 2024 11:32:09 +0800 Subject: [PATCH 03/12] add new line --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index e329115..997434e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,3 +17,4 @@ USER user WORKDIR /home/user CMD ["sh","/home/user/start.sh"] + From 31c1e06a4b01ea7a7b8f4d23aa1e6480895faffc Mon Sep 17 00:00:00 2001 From: WeeSooJun Date: Sat, 6 Apr 2024 11:32:18 +0800 Subject: [PATCH 04/12] remove new line --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 997434e..e329115 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,4 +17,3 @@ USER user WORKDIR /home/user CMD ["sh","/home/user/start.sh"] - From f567ce51fd99c2a9caee8848190eccd2964c5c7f Mon Sep 17 00:00:00 2001 From: WeeSooJun Date: Sat, 6 Apr 2024 11:57:24 +0800 Subject: [PATCH 05/12] Change to artifact repository --- .github/workflows/deploy.yml | 54 ++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index a8cda7c..c8b4ea8 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -5,39 +5,39 @@ on: branches: [ master ] pull_request: branches: [ master ] - + jobs: setup-build-publish-deploy: name: Setup, Build, Publish, and Deploy runs-on: ubuntu-latest steps: - - - name: Checkout - uses: actions/checkout@master - # Setup gcloud CLI - - uses: google-github-actions/setup-gcloud@v0 - with: - service_account_email: ${{ secrets.GCP_EMAIL }} - service_account_key: ${{ secrets.GCP_CREDENTIALS }} - export_default_credentials: true + - name: Checkout + uses: actions/checkout@master + + # Setup gcloud CLI + - uses: google-github-actions/setup-gcloud@v0 + with: + service_account_email: ${{ secrets.GCP_EMAIL }} + service_account_key: ${{ secrets.GCP_CREDENTIALS }} + export_default_credentials: true - # Configure Docker with Credentials - - name: Configure Docker - run: | - gcloud auth configure-docker + # Configure Docker with Credentials + - name: Configure Docker + run: | + gcloud auth configure-docker - # Build the Docker image - - name: Build & Publish - run: | - gcloud config set project ${{ secrets.GCP_PROJECT }} - gcloud builds submit --tag gcr.io/${{ secrets.GCP_PROJECT }}/${{ secrets.GCP_APPLICATION }} - gcloud config set run/region us-central1 + # Build the Docker image + - name: Build & Publish + run: | + gcloud config set project ${{ secrets.GCP_PROJECT }} + gcloud builds submit --tag pkg.dev/${{ secrets.GCP_PROJECT }}/${{ secrets.GCP_APPLICATION }} + gcloud config set run/region us-central1 - # Deploy the Docker image to the GKE cluster - - name: Deploy - run: | - gcloud run deploy ${{ secrets.GCP_APPLICATION }} --image gcr.io/${{ secrets.GCP_PROJECT }}/${{ secrets.GCP_APPLICATION }} \ - --platform managed \ - --allow-unauthenticated \ - --memory 256M + # Deploy the Docker image to the GKE cluster + - name: Deploy + run: | + gcloud run deploy ${{ secrets.GCP_APPLICATION }} --image gcr.io/${{ secrets.GCP_PROJECT }}/${{ secrets.GCP_APPLICATION }} \ + --platform managed \ + --allow-unauthenticated \ + --memory 256M From fe6c77751cc0f8ee863dccc9b8ccc6362038eacf Mon Sep 17 00:00:00 2001 From: WeeSooJun Date: Sat, 6 Apr 2024 12:07:47 +0800 Subject: [PATCH 06/12] Add region-docker prefix to pkg.dev --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index c8b4ea8..f8828b1 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -31,7 +31,7 @@ jobs: - name: Build & Publish run: | gcloud config set project ${{ secrets.GCP_PROJECT }} - gcloud builds submit --tag pkg.dev/${{ secrets.GCP_PROJECT }}/${{ secrets.GCP_APPLICATION }} + gcloud builds submit --region=us-central1 --tag us-central1-docker.pkg.dev/${{ secrets.GCP_PROJECT }}/${{ secrets.GCP_APPLICATION }} gcloud config set run/region us-central1 # Deploy the Docker image to the GKE cluster From 626e419b4cdab7b0ca624b9003297a8fc7d13a15 Mon Sep 17 00:00:00 2001 From: WeeSooJun Date: Sat, 6 Apr 2024 12:39:31 +0800 Subject: [PATCH 07/12] Update deploy.yml to include repository name --- .github/workflows/deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index f8828b1..a28700a 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -31,13 +31,13 @@ jobs: - name: Build & Publish run: | gcloud config set project ${{ secrets.GCP_PROJECT }} - gcloud builds submit --region=us-central1 --tag us-central1-docker.pkg.dev/${{ secrets.GCP_PROJECT }}/${{ secrets.GCP_APPLICATION }} + gcloud builds submit --region=us-central1 --tag us-central1-docker.pkg.dev/${{ secrets.GCP_PROJECT }}/${{ secrets.GCP_APPLICATION }}/${{ secrets.GCP_APPLICATION }} gcloud config set run/region us-central1 # Deploy the Docker image to the GKE cluster - name: Deploy run: | - gcloud run deploy ${{ secrets.GCP_APPLICATION }} --image gcr.io/${{ secrets.GCP_PROJECT }}/${{ secrets.GCP_APPLICATION }} \ + gcloud run deploy ${{ secrets.GCP_APPLICATION }} --image us-central1-docker.pkg.dev/${{ secrets.GCP_PROJECT }}/${{ secrets.GCP_APPLICATION }}/${{ secrets.GCP_APPLICATION }} \ --platform managed \ --allow-unauthenticated \ --memory 256M From c68101adcadc8c27804c0d4baffacb8747571b3f Mon Sep 17 00:00:00 2001 From: WeeSooJun Date: Sat, 6 Apr 2024 12:55:18 +0800 Subject: [PATCH 08/12] Add back spaces --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index a28700a..3d658cd 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -5,7 +5,7 @@ on: branches: [ master ] pull_request: branches: [ master ] - + jobs: setup-build-publish-deploy: name: Setup, Build, Publish, and Deploy From c6e03e33c42b5e1215513d088b431412069b6ab1 Mon Sep 17 00:00:00 2001 From: WeeSooJun Date: Sat, 6 Apr 2024 12:56:42 +0800 Subject: [PATCH 09/12] Undo prettier changes --- .github/workflows/deploy.yml | 50 ++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 3d658cd..d6fd6ea 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -12,32 +12,32 @@ jobs: runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@master + - name: Checkout + uses: actions/checkout@master - # Setup gcloud CLI - - uses: google-github-actions/setup-gcloud@v0 - with: - service_account_email: ${{ secrets.GCP_EMAIL }} - service_account_key: ${{ secrets.GCP_CREDENTIALS }} - export_default_credentials: true + # Setup gcloud CLI + - uses: google-github-actions/setup-gcloud@v0 + with: + service_account_email: ${{ secrets.GCP_EMAIL }} + service_account_key: ${{ secrets.GCP_CREDENTIALS }} + export_default_credentials: true - # Configure Docker with Credentials - - name: Configure Docker - run: | - gcloud auth configure-docker + # Configure Docker with Credentials + - name: Configure Docker + run: | + gcloud auth configure-docker - # Build the Docker image - - name: Build & Publish - run: | - gcloud config set project ${{ secrets.GCP_PROJECT }} - gcloud builds submit --region=us-central1 --tag us-central1-docker.pkg.dev/${{ secrets.GCP_PROJECT }}/${{ secrets.GCP_APPLICATION }}/${{ secrets.GCP_APPLICATION }} - gcloud config set run/region us-central1 + # Build the Docker image + - name: Build & Publish + run: | + gcloud config set project ${{ secrets.GCP_PROJECT }} + gcloud builds submit --region=us-central1 --tag us-central1-docker.pkg.dev/${{ secrets.GCP_PROJECT }}/${{ secrets.GCP_APPLICATION }}/${{ secrets.GCP_APPLICATION }} + gcloud config set run/region us-central1 - # Deploy the Docker image to the GKE cluster - - name: Deploy - run: | - gcloud run deploy ${{ secrets.GCP_APPLICATION }} --image us-central1-docker.pkg.dev/${{ secrets.GCP_PROJECT }}/${{ secrets.GCP_APPLICATION }}/${{ secrets.GCP_APPLICATION }} \ - --platform managed \ - --allow-unauthenticated \ - --memory 256M + # Deploy the Docker image to the GKE cluster + - name: Deploy + run: | + gcloud run deploy ${{ secrets.GCP_APPLICATION }} --image us-central1-docker.pkg.dev/${{ secrets.GCP_PROJECT }}/${{ secrets.GCP_APPLICATION }}/${{ secrets.GCP_APPLICATION }} \ + --platform managed \ + --allow-unauthenticated \ + --memory 256M From a22414e9fe667812ee702fcebc06dab522293179 Mon Sep 17 00:00:00 2001 From: WeeSooJun Date: Sat, 6 Apr 2024 12:57:29 +0800 Subject: [PATCH 10/12] Add back space --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index d6fd6ea..ce77cb3 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -11,7 +11,7 @@ jobs: name: Setup, Build, Publish, and Deploy runs-on: ubuntu-latest steps: - + - name: Checkout uses: actions/checkout@master From ba177f8f1a9bfc7214d2f9b85950c874dc0f0ae0 Mon Sep 17 00:00:00 2001 From: WeeSooJun Date: Sat, 6 Apr 2024 13:05:55 +0800 Subject: [PATCH 11/12] Update to use auth@v2 --- .github/workflows/deploy.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index ce77cb3..3cc65b0 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -16,11 +16,9 @@ jobs: uses: actions/checkout@master # Setup gcloud CLI - - uses: google-github-actions/setup-gcloud@v0 + - uses: google-github-actions/auth@v2 with: - service_account_email: ${{ secrets.GCP_EMAIL }} - service_account_key: ${{ secrets.GCP_CREDENTIALS }} - export_default_credentials: true + credentials_json: ${{ secrets.GCP_CREDENTIALS }} # Configure Docker with Credentials - name: Configure Docker From ab5d4db1f07d6bf1815bb73f6278b8b80950349e Mon Sep 17 00:00:00 2001 From: WeeSooJun Date: Sat, 6 Apr 2024 13:13:20 +0800 Subject: [PATCH 12/12] Add back cloud sdk step --- .github/workflows/deploy.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 3cc65b0..9447609 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -15,10 +15,14 @@ jobs: - name: Checkout uses: actions/checkout@master - # Setup gcloud CLI + # Authenticate with Google Cloud - uses: google-github-actions/auth@v2 with: credentials_json: ${{ secrets.GCP_CREDENTIALS }} + + # Setup gcloud CLI + - name: 'Set up Cloud SDK' + uses: 'google-github-actions/setup-gcloud@v2' # Configure Docker with Credentials - name: Configure Docker