diff --git a/Dockerfile b/Dockerfile index 005f30cf..844c0529 100644 --- a/Dockerfile +++ b/Dockerfile @@ -60,4 +60,4 @@ RUN chmod 777 /var/www/fic-server/onyx/cache/ /var/www/fic-server/onyx/cache/tem EXPOSE 80/tcp 443/tcp VOLUME ["/var/www/fic-server/out","/var/www/fic-server/files","/var/www/fic-server/submissions"] -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"] +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 --copy ../files-in ../files && (../launch_local.sh &); /bin/bash"] diff --git a/gen_hash_link_files.sh b/gen_hash_link_files.sh index 1711fe60..5daba142 100755 --- a/gen_hash_link_files.sh +++ b/gen_hash_link_files.sh @@ -6,6 +6,18 @@ then exit 1 fi +if [ "$1" = "--hard" ] +then + LN="ln" + shift +elif [ "$1" = "--copy" ] +then + LN="cp" + shift +else + LN="ln -s" +fi + FROM=`realpath $1`; shift TO=`realpath $1`; shift @@ -28,5 +40,5 @@ do HASH=`echo -n $FILE | sha384sum | cut -d " " -f 1` mkdir -p "$TO/$HASH/" - ln -s "$i" "$TO/$HASH/" + $LN "$i" "$TO/$HASH/" done