From 2ba9c9cf179b9e02f761ddc7517f6c537590202d Mon Sep 17 00:00:00 2001 From: Trevor Bramwell Date: Thu, 1 Nov 2018 16:24:35 -0700 Subject: Fix Pharos Dashboard JIRA Logins If the dashboard is built locally, the keys get copied to the right place, but as the dashboard images are now pulled and built remotely, the JIRA keys need to be copied into the running web container. Change-Id: Ia5edb4f994465ab2626973b8a36add9bc80a0d9d Signed-off-by: Trevor Bramwell --- jjb/pharos/shell/deploy-dashboard.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/jjb/pharos/shell/deploy-dashboard.sh b/jjb/pharos/shell/deploy-dashboard.sh index 4ca41f48c..46a79c326 100644 --- a/jjb/pharos/shell/deploy-dashboard.sh +++ b/jjb/pharos/shell/deploy-dashboard.sh @@ -7,11 +7,13 @@ # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## - cp $HOME/config.env $WORKSPACE/dashboard -cp $HOME/rsa.pub $WORKSPACE/dashboard -cp $HOME/rsa.pem $WORKSPACE/dashboard - cd $WORKSPACE/dashboard + docker-compose pull docker-compose up -d + +# Copy JIRA keys into web container +WEB_CONTAINER="$(docker ps --filter 'name=dg01' -q)" +docker cp $HOME/rsa.pub $WEB_CONTAINER:/pharos_dashboard/account/ +docker cp $HOME/rsa.pem $WEB_CONTAINER:/pharos_dashboard/account/ -- cgit