Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/1545 (part 2) Setup deployment for live comms site #1548

Merged
merged 23 commits into from
Jan 28, 2022
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
6bec2de
Add deployment scripts
riatzukiza Jan 14, 2022
76342ac
update references to close.svg
riatzukiza Jan 19, 2022
5b76309
move deployment
riatzukiza Jan 19, 2022
63aa88e
Update some links
riatzukiza Jan 20, 2022
f30a4ef
Update scripts/deploy-live-comms.sh
riatzukiza Jan 20, 2022
d1b99e7
Apply suggestions from code review
riatzukiza Jan 20, 2022
d2ecbc5
update links referencing index
riatzukiza Jan 20, 2022
5823f7d
Updates content, tweaks css for paragraph text
reitermb Jan 20, 2022
ad135d9
Merge branch 'feat/1545-add-site-files' into feat/1545-migrate-live-c…
riatzukiza Jan 24, 2022
c6e9cb2
Update documentation
riatzukiza Jan 24, 2022
ffde074
use old non minified css file
riatzukiza Jan 24, 2022
9044fee
Migrates remaining imgur links, adds alt text, adds research synthesi…
reitermb Jan 25, 2022
f9b9e5d
Remove TTS related 'contributing' markdown, add background and review…
reitermb Jan 26, 2022
acdbd6b
Update live-comms/August-2021-Update.html
riatzukiza Jan 26, 2022
82994cc
Update live-comms/August-2021-Update.html
riatzukiza Jan 26, 2022
7763c7f
Update live-comms/June-2021-Update.html
riatzukiza Jan 26, 2022
d61cc19
Update live-comms/June-2021-Update.html
riatzukiza Jan 26, 2022
9fcc235
Update live-comms/June-2021-Update.html
riatzukiza Jan 26, 2022
4cd2ed0
Fixed font-related 404s, fixed broken nav link items
reitermb Jan 27, 2022
fce4aa5
Merge branch 'raft-tdp-main' into feat/1545-migrate-live-comms-site
jorgegonzalez Jan 28, 2022
6d45cc0
Fix mobile nav label inconsistency
reitermb Jan 28, 2022
dc4d27e
Merge branch 'raft-tdp-main' into feat/1545-migrate-live-comms-site
jorgegonzalez Jan 28, 2022
166d8e9
Merge branch 'raft-tdp-main' into feat/1545-migrate-live-comms-site
jorgegonzalez Jan 28, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,9 @@ commands:
- deploy-frontend:
backend-appname: <<parameters.backend-appname>>
frontend-appname: <<parameters.frontend-appname>>
- run:
name: Deploy Live Comms Site
command: ./scripts/deploy-live-comms.sh rolling tdp-live-comms

deploy-infrastructure:
parameters:
Expand Down
2 changes: 1 addition & 1 deletion live-comms/August-2021-Update.html
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
</div>
<nav aria-label="Primary navigation" class="usa-nav">
<button class="usa-nav__close">
<img src="./close.svg" role="img" alt="Close" />
<img src="././img/close.svg" role="img" alt="Close" />
riatzukiza marked this conversation as resolved.
Show resolved Hide resolved
riatzukiza marked this conversation as resolved.
Show resolved Hide resolved
</button>
<ul class="usa-nav__primary usa-accordion">
<li class="usa-nav__primary-item">
Expand Down
2 changes: 1 addition & 1 deletion live-comms/June-2021-Update.html
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
</div>
<nav aria-label="Primary navigation" class="usa-nav">
<button class="usa-nav__close">
<img src="./close.svg" role="img" alt="Close" />
<img src="././img/close.svg" role="img" alt="Close" />
riatzukiza marked this conversation as resolved.
Show resolved Hide resolved
</button>
<ul class="usa-nav__primary usa-accordion">
<li class="usa-nav__primary-item">
Expand Down
Empty file added live-comms/Staticfile
Empty file.
6 changes: 3 additions & 3 deletions live-comms/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
</div>
<nav aria-label="Primary navigation" class="usa-nav">
<button class="usa-nav__close">
<img src="./close.svg" role="img" alt="Close" />
<img src="././img/close.svg" role="img" alt="Close" />
riatzukiza marked this conversation as resolved.
Show resolved Hide resolved
</button>
<ul class="usa-nav__primary usa-accordion">
<li class="usa-nav__primary-item">
Expand Down Expand Up @@ -130,10 +130,10 @@
<a href="#main-content;" class="usa-current" aria-current="page">January 2022</a>
</li>
<li class="usa-sidenav__item">
<a href="August-2021-Update">August 2021</a>
<a href="August-2021-Update.html">August 2021</a>
</li>
<li class="usa-sidenav__item">
<a href="June-2021-Update">June 2021</a>
<a href="June-2021-Update.html">June 2021</a>
</li>
</ul>
</nav>
Expand Down
10 changes: 10 additions & 0 deletions live-comms/manifest.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
version: 1
applications:
- name: tdp-live-comms
buildpacks:
- staticfile_buildpack
memory: 32M
instances: 1
disk_quota: 256M
timeout: 180
33 changes: 33 additions & 0 deletions scripts/deploy-live-comms.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@

#!/bin/sh

riatzukiza marked this conversation as resolved.
Show resolved Hide resolved
# source deploy-util.sh
riatzukiza marked this conversation as resolved.
Show resolved Hide resolved
riatzukiza marked this conversation as resolved.
Show resolved Hide resolved

# The deployment strategy you wish to employ ( rolling update or setting up a new environment)
DEPLOY_STRATEGY=${1}

#The application name defined via the manifest yml for the frontend
CGHOSTNAME_LIVE_COMMS=${2}

update_livecomms()
{
cd live-comms || exit

if [ "$1" = "rolling" ] ; then
# Do a zero downtime deploy. This requires enough memory for
# two apps to exist in the org/space at one time.
cf push "$CGHOSTNAME_LIVE_COMMS" --no-route -f manifest.yml --strategy rolling || exit 1
else
cf push "$CGHOSTNAME_LIVE_COMMS" --no-route -f manifest.yml
fi

cf map-route "$CGHOSTNAME_LIVE_COMMS" app.cloud.gov --hostname "${CGHOSTNAME_LIVE_COMMS}"
}

# perform a rolling update for the backend and frontend deployments if
# specified, otherwise perform a normal deployment
if [ "$DEPLOY_STRATEGY" = "rolling" ] ; then
update_livecomms 'rolling'
else
update_livecomms
fi