othmane/ohif-viewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: google cloud support w/ docker (via env var) (#958)

Browse Source 
* fix: make sure google config is in output

* fix: update config sub to use new paths and file names
This commit is contained in:
Danny Brown 2019-09-26 14:08:44 -04:00 committed by GitHub
parent 7f4d71e412
commit e375a4ab11
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.docker/Viewer-v2.x/entrypoint.sh
View File

@ -7,11 +7,11 @@ if [ ! -z "$CLIENT_ID" ]
echo $CLIENT_ID echo $CLIENT_ID
echo "Updating config..." echo "Updating config..."
# - Use SED to replace the CLIENT_ID that is currently in public/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/config/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 # - Copy google.js to overwrite app-config.js
cp /usr/share/nginx/html/config/google.js /usr/share/nginx/html/config/default.js cp /usr/share/nginx/html/google.js /usr/share/nginx/html/app-config.js
fi fi
echo "Starting Nginx to serve the OHIF Viewer..." echo "Starting Nginx to serve the OHIF Viewer..."

6
platform/viewer/.webpack/webpack.pwa.js
View File

@ -71,6 +71,12 @@ module.exports = (env, argv) => {
// Ignore our configuration files // Ignore our configuration files
ignore: ['config/*', 'html-templates/*', '.DS_Store'], 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 // Copy over and rename our target app config file
{ {
from: `${PUBLIC_DIR}/${APP_CONFIG}`, from: `${PUBLIC_DIR}/${APP_CONFIG}`,