diff --git a/.github/workflows/config.yaml b/.github/workflows/config.yaml index 515cf4c..606c65e 100644 --- a/.github/workflows/config.yaml +++ b/.github/workflows/config.yaml @@ -14,12 +14,12 @@ jobs: runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@v2 + - uses: actions/checkout@v2 - uses: google-github-actions/auth@v2 with: workload_identity_provider: projects/609385848802/locations/global/workloadIdentityPools/github/providers/github service_account: github-actions@sfujiwara.iam.gserviceaccount.com - - run: gcloud storage ls gs://sfujiwara-terraform + - name: Deploy + run: make cloud-build diff --git a/Makefile b/Makefile index 1223e91..dbef2ce 100644 --- a/Makefile +++ b/Makefile @@ -14,6 +14,9 @@ cloud-run-deploy: --image $(DOCKER_IMAGE) \ sfujiwara +cloud-build: + gcloud builds submit --project $(PROJECT) --region=us-central1 + terraform-plan: cd terraform && terraform plan diff --git a/cloudbuild.yaml b/cloudbuild.yaml new file mode 100644 index 0000000..3c63c75 --- /dev/null +++ b/cloudbuild.yaml @@ -0,0 +1,13 @@ +steps: +- name: gcr.io/cloud-builders/docker + args: ['build', '-t', 'us-central1-docker.pkg.dev/sfujiwara/docker/sfujiwara', '.'] + +- name: gcr.io/cloud-builders/docker + args: ['push', 'us-central1-docker.pkg.dev/sfujiwara/docker/sfujiwara'] + +- name: gcr.io/google.com/cloudsdktool/cloud-sdk + entrypoint: gcloud + args: ['run', 'deploy', 'sfujiwara', '--image', 'us-central1-docker.pkg.dev/sfujiwara/docker/sfujiwara', '--region', 'us-central1'] + +images: + - us-central1-docker.pkg.dev/sfujiwara/docker/sfujiwara