diff --git a/Dockerfile b/Dockerfile index 80617e9b..499f826b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -41,7 +41,7 @@ RUN cd /var/www/fic-server/misc; bash ./CA.sh -newca RUN service mysql start && echo "CREATE DATABASE fic;" | mysql -u root && cat /var/www/fic-server/db/fic2014.sql | mysql -u root fic # Uncomment the following line to fill with random values -#RUN cat /var/www/fic-server/db/feed.sql | mysql -u root fic +#RUN service mysql start && cat /var/www/fic-server/db/feed.sql | mysql -u root fic # Configure site ###################################################### @@ -54,4 +54,4 @@ RUN chmod 777 /var/www/fic-server/onyx/cache/ /var/www/fic-server/onyx/cache/tem # ENVIRONNEMENT ####################################################### EXPOSE 80/tcp 443/tcp -CMD ["sh", "-c", "chown -R www-data:www-data /var/www/fic-server/misc /var/www/fic-server/submission; cd /var/www/fic-server/misc; if ! [ -f server.crt ]; then bash ./CA.sh -newserver; fi; service nginx start && service php5-fpm start && service mysql start && /bin/bash"] +CMD ["sh", "-c", "chown -R www-data:www-data /var/www/fic-server/misc /var/www/fic-server/submission; cd /var/www/fic-server/misc; if ! [ -f server.crt ]; then bash ./CA.sh -newserver; fi; service nginx start && service php5-fpm start && service mysql start && mkdir files && ./gen_hash_link_files.sh files-in files && ./launch_local.sh & /bin/bash"] diff --git a/gen_hash_link_files.sh b/gen_hash_link_files.sh index 2cb4873a..a189a623 100755 --- a/gen_hash_link_files.sh +++ b/gen_hash_link_files.sh @@ -1,5 +1,11 @@ #!/bin/bash +if [ $# -lt 2 ] +then + echo "Usage: $0 from to" + exit 1 +fi + FROM=`realpath $1`; shift TO=`realpath $1`; shift diff --git a/launch.sh b/launch.sh index bf5f15ef..aabe646f 100755 --- a/launch.sh +++ b/launch.sh @@ -22,7 +22,7 @@ KP1=$! TMPF=`mktemp` -tail -f "$TMPF" | ./gen_site.pl -d -s /tmp/test.sock -o ./out & +tail -f "$TMPF" | ./gen_site.pl -d -s /tmp/test.sock -o ./out ERRORS HOME all DS & KP2=$! while ! [ -f /tmp/stop ]; diff --git a/launch_local.sh b/launch_local.sh index b86be2c2..d4850c12 100755 --- a/launch_local.sh +++ b/launch_local.sh @@ -22,7 +22,7 @@ KP1=$! TMPF=`mktemp` -tail -f "$TMPF" | ./gen_site.pl -d -s /tmp/test.sock -bt /challenge/ -ba /challenge-admin/ -o ./out & +tail -f "$TMPF" | ./gen_site.pl -d -s /tmp/test.sock -bt /challenge/ -ba /challenge-admin/ -o ./out ERRORS HOME all DS & KP2=$! while ! [ -f /tmp/stop ];