From 96e0374e892a0484ead4fe4ed976c9c98f305295 Mon Sep 17 00:00:00 2001 From: Chloé Azria Date: Thu, 27 Apr 2023 13:35:42 +0200 Subject: [PATCH] fix dachs start bug (logs rights) --- conf/dachs-dockerfile | 4 ++-- conf/docker-entrypoint.sh | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/conf/dachs-dockerfile b/conf/dachs-dockerfile index da67550..1c79ee3 100644 --- a/conf/dachs-dockerfile +++ b/conf/dachs-dockerfile @@ -138,8 +138,8 @@ RUN chgrp 755 /etc/cron.daily/awstats #RUN echo "git pull" >> /usr/bin/docker-entrypoint.sh # add to the script to maintain docker up -RUN echo "tail -f /dev/null" >> /usr/bin/docker-entrypoint.sh +#RUN echo "tail -f /dev/null" >> /usr/bin/docker-entrypoint.sh -ENTRYPOINT /usr/bin/docker-entrypoint.sh && tail -f /dev/null +ENTRYPOINT /usr/bin/docker-entrypoint.sh >>/tmp/entrypoint.log 2>>/tmp/entrypoint.err && tail -f /dev/null diff --git a/conf/docker-entrypoint.sh b/conf/docker-entrypoint.sh index 35367d1..153cddd 100644 --- a/conf/docker-entrypoint.sh +++ b/conf/docker-entrypoint.sh @@ -3,9 +3,13 @@ # script executé au démarrage du docker service ssh restart service postgresql restart +dachs serve start chown -R dachsroot:gavo /var/gavo/logs -chmod -R 755 /var/gavo/logs +chown -R root:gavo /var/gavo/logs/server.stderr +chown -R gavo:gavo /var/gavo/logs/web.log +chmod -R 775 /var/gavo/logs + /usr/bin/perl /usr/lib/cgi-bin/awstats.pl -config=dachs -update for rep in $(find /var/gavo/inputs/[0-9a-zA-Z]* -maxdepth 0 -type d | cut -f5 -d'/') -- libgit2 0.21.2