Merge pull request #247 from adhocteam/rolling-deploys

Rolling deploys
HHS · Mar 16, 2021 · 81e876f · 81e876f
2 parents 2e351ea + 685553d
commit 81e876f
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 11 deletions.
diff --git a/.cfignore b/.cfignore
@@ -3,6 +3,7 @@ cucumber/
 deployment_config/
 frontend/
 src/
+maintenance_page/
 terraform/
 hses.zip
 temp/

diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -57,7 +57,6 @@ commands:
                 \"description\": \"<< parameters.env_name >> Successfully Deployed\"
               }
             }"
-      
   cf_deploy:
     description: "Login to cloud foundry space with service account credentials
       and push application using deployment configuration file."
@@ -118,14 +117,19 @@ commands:
       - run:
           name: Push application with deployment vars
           command: |
-            cf push --vars-file << parameters.deploy_config_file >> \
+            cf push --strategy rolling \
+              --vars-file << parameters.deploy_config_file >> \
               --var AUTH_CLIENT_ID=${<< parameters.auth_client_id >>} \
               --var AUTH_CLIENT_SECRET=${<< parameters.auth_client_secret >>} \
               --var NEW_RELIC_LICENSE_KEY=${<< parameters.new_relic_license >>} \
               --var SESSION_SECRET=${<< parameters.session_secret >>} \
               --var HSES_DATA_FILE_URL=${<< parameters.hses_data_file_url >>} \
               --var HSES_DATA_USERNAME=${<< parameters.hses_data_username >>} \
               --var HSES_DATA_PASSWORD=${<< parameters.hses_data_password >>}
+      - run:
+          name: Push maintenance application
+          command: |
+            cd maintenance_page && cf push --vars-file ../<<parameters.deploy_config_file >>
 parameters:
   cg_org:
     description: "Cloud Foundry cloud.gov organization name"
@@ -160,7 +164,7 @@ parameters:
     default: "main"
     type: string
   sandbox_git_branch:  # change to feature branch to test deployment
-    default: "js-338-383-frontend-tweaks"
+    default: "rolling-deploys"
     type: string
   prod_new_relic_app_id:
     default: "877570491"

diff --git a/Staticfile b/Staticfile
diff --git a/maintenance_page/Staticfile b/maintenance_page/Staticfile
@@ -0,0 +1,2 @@
+root: www
+location_include: includes/*.conf
diff --git a/maintenance_page/manifest.yml b/maintenance_page/manifest.yml
@@ -0,0 +1,6 @@
+---
+applications:
+  - name: tta-smarthub-maintenance-page-((env))
+    buildpacks:
+      - staticfile_buildpack
+    memory: 64M
diff --git a/nginx/conf/includes/maintenancepage.conf → .../nginx/conf/includes/maintenancepage.conf b/nginx/conf/includes/maintenancepage.conf → .../nginx/conf/includes/maintenancepage.conf
diff --git a/maintenance_page/eclkc-blocks-logo.png → maintenance_page/www/eclkc-blocks-logo.png b/maintenance_page/eclkc-blocks-logo.png → maintenance_page/www/eclkc-blocks-logo.png
diff --git a/maintenance_page/index.html → maintenance_page/www/index.html b/maintenance_page/index.html → maintenance_page/www/index.html
@@ -12,7 +12,7 @@
         <img src="/eclkc-blocks-logo.png" alt="TTA Smarthub logo">
        <span>
         Office of Head Start TTA Smart Hub
-       </span> 
+       </span>
     </header>
     <div class="container">
         <div class="left-div">
@@ -25,4 +25,4 @@ <h1>The TTA Smart Hub is temporarily down.</h1>
 
     </div>
 </body>
-</html>
+</html>
diff --git a/maintenance_page/logo64.png → maintenance_page/www/logo64.png b/maintenance_page/logo64.png → maintenance_page/www/logo64.png
diff --git a/maintenance_page/style.css → maintenance_page/www/style.css b/maintenance_page/style.css → maintenance_page/www/style.css
diff --git a/manifest.yml b/manifest.yml
@@ -33,7 +33,3 @@ applications:
       instances: ((worker_instances))
       command: yarn start:worker
       memory: ((worker_memory))
-  - name: tta-smarthub-maintenance-page-((env))
-    buildpacks:
-      - staticfile_buildpack
-    memory: 64M