CDPP / docker_dachs_server

Commit 96e0374e892a0484ead4fe4ed976c9c98f305295

Authored by Chloé Azria
1 parent 6946c341
Exists in master

fix dachs start bug (logs rights)

Showing 2 changed files with 7 additions and 3 deletions   Show diff stats
Inline Side-by-side
conf/dachs-dockerfile
  Diff comments   View file @96e0374
... ... @@ -138,8 +138,8 @@ RUN chgrp 755 /etc/cron.daily/awstats
138 138 #RUN echo "git pull" >> /usr/bin/docker-entrypoint.sh
139 139  
140 140 # add to the script to maintain docker up
141   -RUN echo "tail -f /dev/null" >> /usr/bin/docker-entrypoint.sh
  141 +#RUN echo "tail -f /dev/null" >> /usr/bin/docker-entrypoint.sh
142 142  
143 143  
144   -ENTRYPOINT /usr/bin/docker-entrypoint.sh && tail -f /dev/null
  144 +ENTRYPOINT /usr/bin/docker-entrypoint.sh >>/tmp/entrypoint.log 2>>/tmp/entrypoint.err && tail -f /dev/null
145 145  
... ...
conf/docker-entrypoint.sh
  Diff comments   View file @96e0374
... ... @@ -3,9 +3,13 @@
3 3 # script executé au démarrage du docker
4 4 service ssh restart
5 5 service postgresql restart
  6 +dachs serve start
6 7  
7 8 chown -R dachsroot:gavo /var/gavo/logs
8   -chmod -R 755 /var/gavo/logs
  9 +chown -R root:gavo /var/gavo/logs/server.stderr
  10 +chown -R gavo:gavo /var/gavo/logs/web.log
  11 +chmod -R 775 /var/gavo/logs
  12 +
9 13 /usr/bin/perl /usr/lib/cgi-bin/awstats.pl -config=dachs -update
10 14  
11 15 for rep in $(find /var/gavo/inputs/[0-9a-zA-Z]* -maxdepth 0 -type d | cut -f5 -d'/')
... ...