diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d2a28172..106ef152 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -34,3 +34,14 @@ deploy-staging: - if: '$CI_COMMIT_BRANCH == "main"' when: on_success allow_failure: false + +deploy-prod: + stage: prod + image: google/cloud-sdk + script: + - cd ./src + - make deploy-prod + rules: + - if: '$CI_COMMIT_BRANCH == "main"' + when: manual + allow_failure: false diff --git a/src/Makefile b/src/Makefile index fc3e9db7..69a30016 100644 --- a/src/Makefile +++ b/src/Makefile @@ -19,4 +19,4 @@ deploy-staging: authorize-service-account gsutil -m rsync -d -r ${output} gs://staging.dynamicbible.com update-bucket-configs: gcloud/buckets.yaml - gcloud deployment-manager deployments update dynamicbible-buckets --config gcloud/buckets.yaml + gcloud deployment-manager deployments update --format=json dynamicbible-buckets --config gcloud/buckets.yaml diff --git a/src/gcloud/buckets.yaml b/src/gcloud/buckets.yaml index 9ac499af..eb3a06f4 100644 --- a/src/gcloud/buckets.yaml +++ b/src/gcloud/buckets.yaml @@ -1,24 +1,26 @@ --- resources: - #- name: dynamicbible.com - # type: storage.v1.bucket - # properties: - # bucket: dynamicbible.com - # project: "dynamicbible-7c6cf" - # location: "us-east1" - # website: - # notFoundPage: 404.html - # mainPageSuffix: index.html - # acl: - # - entity: "project-owners-dynamicbible-7c6cf" - # role: OWNER - # - entity: "project-editors-dynamicbible-7c6cf" - # role: WRITER - # - entity: "project-viewers-dynamicbible-7c6cf" - # role: READER - # defaultObjectAcl: - # - entity: allUsers - # role: READER + - name: dynamicbible.com + type: storage.v1.bucket + properties: + bucket: dynamicbible.com + project: "dynamicbible-7c6cf" + location: "us-east1" + website: + notFoundPage: 404.html + mainPageSuffix: index.html + acl: + - entity: "project-owners-dynamicbible-7c6cf" + role: OWNER + - entity: "project-editors-dynamicbible-7c6cf" + role: WRITER + - entity: "project-viewers-dynamicbible-7c6cf" + role: READER + - entity: "user-$(ref.gitlab-service-account.email)" + role: WRITER + defaultObjectAcl: + - entity: allUsers + role: READER - name: staging.dynamicbible.com type: storage.v1.bucket properties: @@ -51,10 +53,10 @@ resources: parent: $(ref.gitlab-service-account.name) name: gitlab-service-account-key outputs: - #- name: dynamicbible.comselfLink - # value: "https://console.cloud.google.com/storage/browser/dynamicbible.com" - #- name: dynamicbible.comgsLink - # value: "gs://dynamicbible.com" + - name: dynamicbible.comselfLink + value: "https://console.cloud.google.com/storage/browser/dynamicbible.com" + - name: dynamicbible.comgsLink + value: "gs://dynamicbible.com" - name: gitlab-service-account-id value: $(ref.gitlab-service-account.uniqueId) - name: gitlab-service-account-email