Separate staging and prod

rajesh2k3 · Oct 2, 2020 · e041bcb · e041bcb
1 parent 8282500
commit e041bcb
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 9 deletions.
diff --git a/.github/workflows/build-push-deploy.yaml b/.github/workflows/build-push-deploy.yaml
@@ -4,6 +4,8 @@ on:
  push:
  branches:
  - master
+ tags:
+ - v\d+.\d+.\d+
 
 env:
  PROJECT_ID: devops-directive-traversy
@@ -14,6 +16,14 @@ jobs:
  runs-on: ubuntu-latest
 
  steps:
+ - name: Set ENV
+ run: |-
+ if [ ${GITHUB_REF##*/} = "master" ]; then
+ echo "::set-env name=ENV::staging"
+ else 
+ echo "::set-env name=ENV::prod"
+ fi
+
  - name: Checkout
  uses: actions/checkout@v2
 

diff --git a/Makefile b/Makefile
@@ -11,25 +11,28 @@ create-tf-backend-bucket:
 
 ### 
 
+check-env:
+ifndef ENV
+ $(error Please set ENV=[staging|prod])
+endif
+
 define get-secret
 $(shell gcloud secrets versions access latest --secret=$(1) --project=$(PROJECT_ID))
 endef
 
 ###
 
-ENV=staging
-
-terraform-create-workspace: 
+terraform-create-workspace: check-env
  cd terraform && \
  terraform workspace new $(ENV)
 
-terraform-init:
+terraform-init: check-env
  cd terraform && \
  terraform workspace select $(ENV) && \
  terraform init
 
 TF_ACTION?=plan
-terraform-action:
+terraform-action: check-env
  @cd terraform && \
  terraform workspace select $(ENV) && \
  terraform $(TF_ACTION) \
@@ -50,12 +53,12 @@ REMOTE_TAG=gcr.io/$(PROJECT_ID)/$(LOCAL_TAG)
 CONTAINER_NAME=storybooks-api
 DB_NAME=storybooks
 
-ssh:
+ssh: check-env
  gcloud compute ssh $(SSH_STRING) \
  --project=$(PROJECT_ID) \
  --zone=$(ZONE)
 
-ssh-cmd:
+ssh-cmd: check-env
  @gcloud compute ssh $(SSH_STRING) \
  --project=$(PROJECT_ID) \
  --zone=$(ZONE) \
@@ -68,7 +71,7 @@ push:
  docker tag $(LOCAL_TAG) $(REMOTE_TAG)
  docker push $(REMOTE_TAG)
 
-deploy:
+deploy: check-env
  $(MAKE) ssh-cmd CMD='docker-credential-gcr configure-docker'
  @echo "pulling new container image..."
  $(MAKE) ssh-cmd CMD='docker pull $(REMOTE_TAG)'

diff --git a/terraform/environments/prod/config.tfvars b/terraform/environments/prod/config.tfvars
@@ -0,0 +1 @@
+gcp_machine_type = "n1-standard-4"
diff --git a/views/partials/_header.hbs b/views/partials/_header.hbs
@@ -1,7 +1,7 @@
 <nav class="grey darken-3">
  <div class="nav-wrapper container">
 
- <a href="#!" class="brand-logo center">StoryBooks</a>
+ <a href="#!" class="brand-logo center">StoryBooks!!!</a>
  <a href="#" data-target="mobile-demo" class="sidenav-trigger show-on-large"><i class="fas fa-bars"></i></a>
  <ul class="sidenav" id="mobile-demo">
  <li><a href="/stories">Public Stories</a></li>