diff options
| -rwxr-xr-x | deploy/config.sh | 4 | ||||
| -rw-r--r-- | deploy/deploy-env.yaml | 2 | ||||
| -rw-r--r-- | deploy/deploy.yaml | 4 | ||||
| -rw-r--r-- | deploy/sitemap.yaml | 6 |
4 files changed, 9 insertions, 7 deletions
diff --git a/deploy/config.sh b/deploy/config.sh index 7ffaeba8..fbfd8dc3 100755 --- a/deploy/config.sh +++ b/deploy/config.sh @@ -24,9 +24,9 @@ main() { dyn_config_bucket=$(config_bucket $env) dyn_config_object=${env}-config.yaml dyn_config_gcs=gs://$dyn_config_bucket/$dyn_config_object - runcmd gsutil cp private/config/$env-config.yaml $dyn_config_gcs + runcmd gcloud storage cp private/config/$env-config.yaml $dyn_config_gcs dyn_exclude_gcs=gs://$dyn_config_bucket/config/excluded.txt - runcmd gsutil cp private/config/excluded.txt $dyn_exclude_gcs + runcmd gcloud storage cp private/config/excluded.txt $dyn_exclude_gcs } main $@ diff --git a/deploy/deploy-env.yaml b/deploy/deploy-env.yaml index 7f606f6a..fcc74d00 100644 --- a/deploy/deploy-env.yaml +++ b/deploy/deploy-env.yaml @@ -37,7 +37,7 @@ steps: - -c - deploy/build.sh $PROJECT_ID $(cat _BUILD_TAG) - id: Config - name: gcr.io/cloud-builders/gsutil + name: gcr.io/cloud-builders/gcloud entrypoint: deploy/config.sh args: - $_ENV diff --git a/deploy/deploy.yaml b/deploy/deploy.yaml index 96169118..b70e1bec 100644 --- a/deploy/deploy.yaml +++ b/deploy/deploy.yaml @@ -37,7 +37,7 @@ steps: - -c - deploy/build.sh $PROJECT_ID $(cat _BUILD_TAG) - id: Config - staging - name: gcr.io/cloud-builders/gsutil + name: gcr.io/cloud-builders/gcloud entrypoint: deploy/config.sh args: - staging @@ -68,7 +68,7 @@ steps: env: - QUOTA_BYPASS=$_QUOTA_BYPASS - id: Config - prod - name: gcr.io/cloud-builders/gsutil + name: gcr.io/cloud-builders/gcloud entrypoint: deploy/config.sh args: - prod diff --git a/deploy/sitemap.yaml b/deploy/sitemap.yaml index 353d5ae6..35b7c1cc 100644 --- a/deploy/sitemap.yaml +++ b/deploy/sitemap.yaml @@ -26,11 +26,13 @@ steps: go run ./devtools/cmd/sitemap -user=cloudbuild -password="$$PASSWORD" $_ENV secretEnv: ['PASSWORD'] - id: Publish - name: gcr.io/cloud-builders/gsutil + name: gcr.io/cloud-builders/gcloud + entrypoint: gcloud dir: private args: + - storage - cp - - -r + - --recursive - sitemap - gs://$_ENV-pkg.go.dev availableSecrets: |