diff options
| -rw-r--r-- | components/congress/test-webapp/setup/install_congress_testserver_1.sh | 15 | ||||
| -rw-r--r-- | components/congress/test-webapp/www/Dockerfile | 2 |
2 files changed, 8 insertions, 9 deletions
diff --git a/components/congress/test-webapp/setup/install_congress_testserver_1.sh b/components/congress/test-webapp/setup/install_congress_testserver_1.sh index 82e4686..833dcc7 100644 --- a/components/congress/test-webapp/setup/install_congress_testserver_1.sh +++ b/components/congress/test-webapp/setup/install_congress_testserver_1.sh @@ -97,22 +97,21 @@ EOF sudo service docker start echo "Setup webapp files" - mkdir /tmp/copper/log - mkdir /tmp/copper + if [ ! -d /tmp/copper ]; then mkdir /tmp/copper; fi + if [ ! -d /tmp/copper/log ]; then mkdir /tmp/copper/log; fi cp ~/congress/*.sh /tmp/copper cp -r ~/git/copper/components/congress/test-webapp/* /tmp/copper/ echo "Point proxy.php to the Congress server" source /tmp/copper/env.sh - sed -i -- "s/CONGRESS_HOST/$CONGRESS_HOST/g" /tmp/copper/html/proxy/index.php + sed -i -- "s/CONGRESS_HOST/$CONGRESS_HOST/g" /tmp/copper/www/html/proxy/index.php - chmod 755 /tmp/copper/setup/install_congress_testserver_2.sh - - sudo docker build -t copper /tmp/copper/ + echo "Start webapp container" + cd /tmp/copper/ + sudo docker build -t centos . sudo docker run -d --name copper copper echo "Start Centos container" - sudo docker pull centos - export CID=$(sudo docker run -it -P --name copper -v /tmp/copper:/opt/copper centos) + export CID=$(sudo docker run -d -t -P --name copper -v /tmp/copper:/opt/copper centos) echo "Attach to the Centos container" echo "Once logged in, enter the command 'source /opt/copper/setup/install_congress_testserver_2.sh'" sudo docker attach $CID diff --git a/components/congress/test-webapp/www/Dockerfile b/components/congress/test-webapp/www/Dockerfile index 168d389..06c4dcd 100644 --- a/components/congress/test-webapp/www/Dockerfile +++ b/components/congress/test-webapp/www/Dockerfile @@ -1,2 +1,2 @@ FROM php:5.6-apache -COPY html/ /var/www/html/ +COPY www/html/ /var/www/html/ |