From e375a4ab1129f80e823a004d40c155864928995e Mon Sep 17 00:00:00 2001 From: Danny Brown Date: Thu, 26 Sep 2019 14:08:44 -0400 Subject: [PATCH] fix: google cloud support w/ docker (via env var) (#958) * fix: make sure google config is in output * fix: update config sub to use new paths and file names --- .docker/Viewer-v2.x/entrypoint.sh | 8 ++++---- platform/viewer/.webpack/webpack.pwa.js | 6 ++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.docker/Viewer-v2.x/entrypoint.sh b/.docker/Viewer-v2.x/entrypoint.sh index 9f033feb6..092bfd321 100644 --- a/.docker/Viewer-v2.x/entrypoint.sh +++ b/.docker/Viewer-v2.x/entrypoint.sh @@ -7,11 +7,11 @@ if [ ! -z "$CLIENT_ID" ] echo $CLIENT_ID echo "Updating config..." - # - Use SED to replace the CLIENT_ID that is currently in public/config/google.js - sed -i -e "s/YOURCLIENTID.apps.googleusercontent.com/$CLIENT_ID/g" /usr/share/nginx/html/config/google.js + # - Use SED to replace the CLIENT_ID that is currently in google.js + sed -i -e "s/YOURCLIENTID.apps.googleusercontent.com/$CLIENT_ID/g" /usr/share/nginx/html/google.js - # - Copy public/config/google.js to overwrite public/config/default.js - cp /usr/share/nginx/html/config/google.js /usr/share/nginx/html/config/default.js + # - Copy google.js to overwrite app-config.js + cp /usr/share/nginx/html/google.js /usr/share/nginx/html/app-config.js fi echo "Starting Nginx to serve the OHIF Viewer..." diff --git a/platform/viewer/.webpack/webpack.pwa.js b/platform/viewer/.webpack/webpack.pwa.js index e7d709754..e9fb77a7c 100644 --- a/platform/viewer/.webpack/webpack.pwa.js +++ b/platform/viewer/.webpack/webpack.pwa.js @@ -71,6 +71,12 @@ module.exports = (env, argv) => { // Ignore our configuration files ignore: ['config/*', 'html-templates/*', '.DS_Store'], }, + // Short term solution to make sure GCloud config is available in output + // for our docker implementation + { + from: `${PUBLIC_DIR}/config/google.js`, + to: `${DIST_DIR}/google.js`, + }, // Copy over and rename our target app config file { from: `${PUBLIC_DIR}/${APP_CONFIG}`,