Permalink
Browse files

Use one deploy script for both PWS and PCF

- Update the package.sh script to use this one script
- PCF's deploy.sh used to build the front end, but that's not
  the spirit of the release package
- Update PCF/config/config.js to use correct websocket port (4443)
  • Loading branch information...
Kehrlann committed Jul 22, 2018
1 parent 594458c commit 82c7f367d80d77a1632b4a3adb9a476101350fc3
Showing with 24 additions and 29 deletions.
  1. +5 −3 deployment/{pws → }/deploy.sh
  2. +1 −1 deployment/pcf/config/config.js
  3. +0 −14 deployment/pcf/deploy.sh
  4. +5 −0 humans.txt
  5. +13 −11 package.sh
View
@@ -4,9 +4,11 @@ set -e
# The directory in which this script is located
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
ASSETS_DIR="$SCRIPT_DIR"/assets
CONFIG_DIR="$SCRIPT_DIR"/config
cf push -f config/manifest-api.yml -p "$SCRIPT_DIR"/assets/api
cf push -f "$CONFIG_DIR"/manifest-api.yml -p "$ASSETS_DIR"/api
cf run-task {{api-app-name}} 'ADMIN_EMAIL=email@example.com ADMIN_PASSWORD=password rake admin:create_user'
cp config/config.js "$SCRIPT_DIR"/assets/web
cf push -f config/manifest-web.yml -p "$SCRIPT_DIR"/assets/web
cp "$CONFIG_DIR"/config.js "$ASSETS_DIR"/web
cf push -f "$CONFIG_DIR"/manifest-web.yml -p "$ASSETS_DIR"/web
@@ -6,7 +6,7 @@ window.Retro = {
"stylesheets": ["application.css"],
"useRevManifest": true,
"api_base_url": "https://{{api-app-name}}.{{pcf-url}}",
"websocket_url": "wss://{{api-app-name}}.{{pcf-url}}:443/cable",
"websocket_url": "wss://{{api-app-name}}.{{pcf-url}}:4443/cable",
"contact": "",
"terms": "",
"privacy": ""
View

This file was deleted.

Oops, something went wrong.
View
@@ -53,6 +53,11 @@ Contact: froso.ellina@gmail.com
Product Designer: Zarrin Rahman
Contact: zarrin.rahman@gmail.com
/* PIVOTAL PARIS */
Engineer: Daniel Garnier-Moiroux
Contact: git@garnier.wf
/* CONTRIBUTORS */
Engineer: Andrew Leung
View
@@ -4,33 +4,35 @@ set -e
mkdir package
# BUILD FRONT-END
pushd web
NODE_ENV=production gulp assets
gulp package
popd
# PWS
cp -r deployment/pws package
cp -r deployment/deploy.sh package/pws/deploy.sh
chmod u+x package/pws/deploy.sh
mkdir package/pws/assets
cp -r api package/pws/assets/api
pushd web
NODE_ENV=production gulp assets
gulp package
popd
cp -r web/package package/pws/assets/web
# PCF
cp -r deployment/pcf package
cp -r deployment/deploy.sh package/pcf/deploy.sh
chmod u+x package/pcf/deploy.sh
mkdir package/pcf/assets
cp -r api package/pcf/assets/api
pushd web
NODE_ENV=production gulp assets
gulp package
popd
cp -r web/package package/pcf/assets/web
# Docs
cp deployment/INSTRUCTIONS.md package

0 comments on commit 82c7f36

Please sign in to comment.