diff --git a/Dockerfile b/Dockerfile index 3d17b88..32421a4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,8 +22,8 @@ RUN echo "$COMPOSER_SHA256_SUM composer.phar" | sha256sum -c - || exit 1 RUN mv composer.phar /usr/bin/composer RUN chmod +x /usr/bin/composer -ENV VERSION=1.5.1 -ENV SHA256_SUM=611b0d80227d0b70289c715787b2d85fd15ed915eb56d585c104c24376036e83 +ENV VERSION=1.5.2 +ENV SHA256_SUM=f03968381156fe790d858af7e069c5550a8577fb964f96624434895272053838 RUN wget https://github.com/roundcube/roundcubemail/releases/download/$VERSION/roundcubemail-$VERSION-complete.tar.gz RUN echo "$SHA256_SUM roundcubemail-$VERSION-complete.tar.gz" | sha256sum -c - || exit 1 RUN mkdir -p /var/lib/roundcube diff --git a/rootfs/bin/dbinit b/rootfs/bin/dbinit index 6186d37..46062e0 100755 --- a/rootfs/bin/dbinit +++ b/rootfs/bin/dbinit @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv sh +#!/bin/sh PGPASSWORD=$DB_PASSWORD psql -h $DB_HOST -U $DB_USER -d $DB_NAME -c "SELECT EXISTS (SELECT 1 FROM information_schema.tables WHERE table_name = 'session')" | grep f diff --git a/rootfs/etc/s6-overlay/s6-rc.d/nginx/run b/rootfs/etc/s6-overlay/s6-rc.d/nginx/run index 807d20a..e33de41 100644 --- a/rootfs/etc/s6-overlay/s6-rc.d/nginx/run +++ b/rootfs/etc/s6-overlay/s6-rc.d/nginx/run @@ -1,3 +1,3 @@ -#!/usr/bin/with-contenv sh +#!/bin/sh exec nginx -g "daemon off;" diff --git a/rootfs/etc/services.d/nginx/run b/rootfs/etc/services.d/nginx/run deleted file mode 100644 index 807d20a..0000000 --- a/rootfs/etc/services.d/nginx/run +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/with-contenv sh - -exec nginx -g "daemon off;"