diff options
Diffstat (limited to 'components/congress/test-webapp/setup')
-rwxr-xr-x | components/congress/test-webapp/setup/clean_congress_testserver.sh | 1 | ||||
-rw-r--r-- | components/congress/test-webapp/setup/install_congress_testserver.sh | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/components/congress/test-webapp/setup/clean_congress_testserver.sh b/components/congress/test-webapp/setup/clean_congress_testserver.sh index 1d06811..e23bcbd 100755 --- a/components/congress/test-webapp/setup/clean_congress_testserver.sh +++ b/components/congress/test-webapp/setup/clean_congress_testserver.sh @@ -29,5 +29,6 @@ echo "Stop copper-webapp container" sudo docker stop $CID echo "Remove copper-webapp container" sudo docker rm $CID +# Use this if the server is not running # docker rm `docker ps -aq` set +x diff --git a/components/congress/test-webapp/setup/install_congress_testserver.sh b/components/congress/test-webapp/setup/install_congress_testserver.sh index 9f2aaa9..9145c98 100644 --- a/components/congress/test-webapp/setup/install_congress_testserver.sh +++ b/components/congress/test-webapp/setup/install_congress_testserver.sh @@ -88,8 +88,12 @@ if [ ! -d /tmp/copper/log ]; then chmod 777 /tmp/copper/log fi source /tmp/copper/env.sh + echo "Point proxy.php to the Congress server" sed -i -- "s/CONGRESS_HOST/$CONGRESS_HOST/g" /tmp/copper/copper/components/congress/test-webapp/www/proxy/index.php +echo "Add parameters for API authentication" +sed -i -- "s/OS_USERNAME/$OS_USERNAME/g" /tmp/copper/copper/components/congress/test-webapp/www/proxy/index.php +sed -i -- "s/OS_PASSWORD/$OS_PASSWORD/g" /tmp/copper/copper/components/congress/test-webapp/www/proxy/index.php echo "Start webapp container" sudo docker build -t copper-webapp /tmp/copper/copper/components/congress/test-webapp/ |