diff --git a/Dockerfile b/Dockerfile index c7a11a1..149fc7f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,17 +25,17 @@ RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/a php7-pdo_sqlite@testing \ php7-sqlite3@testing \ && cd /tmp \ - && wget -q http://repository.rainloop.net/v2/webmail/rainloop-community-latest.zip \ - && wget -q http://repository.rainloop.net/v2/webmail/rainloop-community-latest.zip.asc \ + && wget -q http://repository.rainloop.net/v2/webmail/rainloop-latest.zip \ + && wget -q http://repository.rainloop.net/v2/webmail/rainloop-latest.zip.asc \ && wget -q http://repository.rainloop.net/RainLoop.asc \ - && echo "Verifying authenticity of rainloop-community-latest.zip using GPG..." \ + && echo "Verifying authenticity of rainloop-latest.zip using GPG..." \ && gpg --import RainLoop.asc \ - && FINGERPRINT="$(LANG=C gpg --verify rainloop-community-latest.zip.asc rainloop-community-latest.zip 2>&1 \ + && FINGERPRINT="$(LANG=C gpg --verify rainloop-latest.zip.asc rainloop-latest.zip 2>&1 \ | sed -n "s#Primary key fingerprint: \(.*\)#\1#p")" \ && if [ -z "${FINGERPRINT}" ]; then echo "Warning! Invalid GPG signature!" && exit 1; fi \ && if [ "${FINGERPRINT}" != "${GPG_rainloop}" ]; then echo "Warning! Wrong GPG fingerprint!" && exit 1; fi \ - && echo "All seems good, now unzipping rainloop-community-latest.zip..." \ - && mkdir /rainloop && unzip -q /tmp/rainloop-community-latest.zip -d /rainloop \ + && echo "All seems good, now unzipping rainloop-latest.zip..." \ + && mkdir /rainloop && unzip -q /tmp/rainloop-latest.zip -d /rainloop \ && find /rainloop -type d -exec chmod 755 {} \; \ && find /rainloop -type f -exec chmod 644 {} \; \ && apk del gnupg \ diff --git a/startup b/startup index c2bbe52..7e03684 100644 --- a/startup +++ b/startup @@ -4,7 +4,7 @@ addgroup -g ${GID} rainloop && adduser -h /rainloop -s /bin/sh -D -G rainloop -u ${UID} rainloop # Set permissions -chown -R rainloop:rainloop /rainloop /var/run/php-fpm.sock /var/lib/nginx /tmp +chown -R rainloop:rainloop /rainloop /var/lib/nginx # RUN ! supervisord -c /etc/supervisor/supervisord.conf diff --git a/supervisord.conf b/supervisord.conf index f2cd4b1..a65aaf9 100644 --- a/supervisord.conf +++ b/supervisord.conf @@ -1,4 +1,6 @@ [supervisord] +logfile = /tmp/supervisord.log +pidfile = /tmp/supervisord.pid nodaemon=true [program:php-fpm]