Remove misc directory

This commit is contained in:
nemunaire 2015-01-13 17:58:33 +01:00 committed by Nemunaire
commit 8cab91f51a
15 changed files with 36 additions and 41 deletions

View file

@ -24,11 +24,11 @@ RUN apt-get -y update && \
&& \
apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
RUN useradd -d /var/www/fic-server/misc/ -M -N -g www-data synchro
RUN useradd -d /var/www/fic-server -M -N -g www-data synchro
# Copying files #######################################################
WORKDIR /var/www/fic-server/misc
WORKDIR /var/www/fic-server
ADD . /var/www/fic-server/
@ -49,22 +49,17 @@ RUN ln -sf /var/www/fic-server/onyx/config/sample.root.xml /var/www/fic-server/o
# ENVIRONNEMENT #######################################################
EXPOSE 80/tcp 443/tcp
VOLUME ["/var/www/fic-server/out","/var/www/fic-server/files","/var/www/fic-server/submission","/var/www/fic-server/misc/shared"]
VOLUME ["/var/www/fic-server/out","/var/www/fic-server/files","/var/www/fic-server/submission","/var/www/fic-server/shared"]
CMD mkdir -p /var/www/fic-server/logs; \
chown -R www-data:www-data /var/www/fic-server/misc; \
chown -R www-data:www-data /var/www/fic-server/shared /var/www/fic-server/PKI; \
chown -R synchro:www-data /var/www/fic-server/submission /var/www/fic-server/logs /var/www/fic-server/out; \
chmod 660 /var/www/fic-server/submission; \
if ! [ -f server.crt ]; \
then \
bash ./CA.sh -newserver; \
fi; \
bash ./CA.sh -gencrl && \
service nginx start && \
service php5-fpm start && \
service mysql start && \
../nginx_gen_team.sh > ../misc/shared/nginx-teams.conf && \
./nginx_gen_team.sh > ./shared/nginx-teams.conf && \
echo 'Copying files...' && \
../gen_hash_link_files.sh --copy ../files-in ../files; \
(../launch_local.sh &); \
./gen_hash_link_files.sh --copy ./files-in ./files; \
(./launch_local.sh &); \
/bin/bash