diff --git a/Dockerfile b/Dockerfile index c76c8b2..3968744 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,14 +7,6 @@ RUN echo "$NC_SHA256_SUM nextcloud-$NC_VERSION.tar.bz2" | sha256sum -c - || exi RUN mkdir -p /var/lib/nextcloud RUN tar xjf nextcloud-$NC_VERSION.tar.bz2 -C /var/lib/nextcloud --strip 1 -ENV TFA_VERSION=v6.4.1 -ENV TFA_SHA256_SUM=59ad8feada69ef92310ac4c6e01e4343cfa24f347bca32818b864305cbfe00e2 -RUN wget https://github.com/nextcloud-releases/twofactor_totp/releases/download/$TFA_VERSION/twofactor_totp-$TFA_VERSION.tar.gz -RUN echo "$TFA_SHA256_SUM twofactor_totp-$TFA_VERSION.tar.gz" | sha256sum -c - || exit 1 -RUN rm -r /var/lib/nextcloud/apps/twofactor_totp -RUN mkdir /var/lib/nextcloud/apps/twofactor_totp -RUN tar xzf twofactor_totp-$TFA_VERSION.tar.gz -C /var/lib/nextcloud/apps/twofactor_totp --strip 1 - ENV POLLS_VERSION=5.0.5 ENV POLLS_SHA256_SUM=48adf460a65e8adf58561886df0454cda4a642bcd0d3ccc561ef05d25b6a810e RUN wget https://github.com/nextcloud/polls/releases/download/v$POLLS_VERSION/polls-$POLLS_VERSION.tar.gz diff --git a/rootfs/bin/nextcloud-config b/rootfs/bin/nextcloud-config index 7d0720b..4962b3d 100755 --- a/rootfs/bin/nextcloud-config +++ b/rootfs/bin/nextcloud-config @@ -5,19 +5,19 @@ cd /var/lib/nextcloud chmod +x ./occ if [ ! -f /var/lib/nextcloud/data/.installed ]; then - s6-setuidgid nginx ./occ maintenance:install \ - --database=pgsql \ - --database-host="$DB_HOST" \ - --database-name="$DB_NAME" \ - --database-user="$DB_USER" \ - --database-pass="$DB_PASSWORD" \ - --database-port="$DB_PORT" \ - --admin-user="$ADMIN_USER" \ - --admin-pass="$ADMIN_PASSWORD" \ - --data-dir=/var/lib/nextcloud/data/ \ - --no-interaction + s6-setuidgid nginx ./occ maintenance:install \ + --database=pgsql \ + --database-host="$DB_HOST" \ + --database-name="$DB_NAME" \ + --database-user="$DB_USER" \ + --database-pass="$DB_PASSWORD" \ + --database-port="$DB_PORT" \ + --admin-user="$ADMIN_USER" \ + --admin-pass="$ADMIN_PASSWORD" \ + --data-dir=/var/lib/nextcloud/data/ \ + --no-interaction - touch /var/lib/nextcloud/data/.installed + touch /var/lib/nextcloud/data/.installed fi s6-setuidgid nginx ./occ config:app:set --value cron core backgroundjobs_mode @@ -26,7 +26,6 @@ s6-setuidgid nginx ./occ app:enable text s6-setuidgid nginx ./occ app:enable files_pdfviewer s6-setuidgid nginx ./occ app:enable theming s6-setuidgid nginx ./occ app:enable photos -s6-setuidgid nginx ./occ app:enable twofactor_totp s6-setuidgid nginx ./occ app:enable twofactor_backupcodes s6-setuidgid nginx ./occ app:enable polls s6-setuidgid nginx ./occ app:enable calendar