From 89202e605211c33c07dc561a10100081778f26c1 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Mon, 14 Feb 2022 08:38:12 +0100 Subject: [PATCH] update to nextcloud 23 --- Dockerfile | 71 ++++++++++--------- .../00-nextcloud => bin/nextcloud-config} | 2 +- rootfs/etc/fix-attrs.d/01-nextcloud-data-dir | 2 - rootfs/etc/s6-overlay/s6-rc.d/crond/run | 3 + rootfs/etc/s6-overlay/s6-rc.d/crond/type | 1 + .../s6-overlay/s6-rc.d/nextcloud-config/type | 1 + .../s6-overlay/s6-rc.d/nextcloud-config/up | 1 + .../etc/s6-overlay/s6-rc.d/nginx/dependencies | 2 + .../s6-rc.d}/nginx/run | 2 +- rootfs/etc/s6-overlay/s6-rc.d/nginx/type | 1 + .../s6-overlay/s6-rc.d/user/contents.d/crond | 0 .../s6-overlay/s6-rc.d/user/contents.d/nginx | 0 rootfs/etc/services.d/crond/run | 3 - 13 files changed, 48 insertions(+), 41 deletions(-) rename rootfs/{etc/cont-init.d/00-nextcloud => bin/nextcloud-config} (99%) mode change 100644 => 100755 delete mode 100644 rootfs/etc/fix-attrs.d/01-nextcloud-data-dir create mode 100644 rootfs/etc/s6-overlay/s6-rc.d/crond/run create mode 100644 rootfs/etc/s6-overlay/s6-rc.d/crond/type create mode 100644 rootfs/etc/s6-overlay/s6-rc.d/nextcloud-config/type create mode 100644 rootfs/etc/s6-overlay/s6-rc.d/nextcloud-config/up create mode 100644 rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies rename rootfs/etc/{services.d => s6-overlay/s6-rc.d}/nginx/run (51%) create mode 100644 rootfs/etc/s6-overlay/s6-rc.d/nginx/type create mode 100644 rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/crond create mode 100644 rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/nginx delete mode 100644 rootfs/etc/services.d/crond/run diff --git a/Dockerfile b/Dockerfile index f36595e..2c3c344 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,91 +1,91 @@ -FROM alpine:3.14 AS builder +FROM alpine:3.15 AS builder -ENV NC_VERSION=22.1.0 -ENV NC_SHA256_SUM=4820808f799146853604e1fa27d7f292449018a44dc73bf928a97b02028318ba +ENV NC_VERSION=23.0.1 +ENV NC_SHA256_SUM=5e753cd458f355be08c0bfa6531172bad5ffda9cbc0d405f52c0e544eeb4f710 RUN wget https://download.nextcloud.com/server/releases/nextcloud-$NC_VERSION.tar.bz2 RUN echo "$NC_SHA256_SUM nextcloud-$NC_VERSION.tar.bz2" | sha256sum -c - || exit 1 RUN mkdir -p /var/lib/nextcloud RUN tar xjf nextcloud-$NC_VERSION.tar.bz2 -C /var/lib/nextcloud --strip 1 -ENV TFA_VERSION=v6.1.0 -ENV TFA_SHA256_SUM=05dcf74305d60fded13577a5ab48aef8538aa34efb209aac50e24704a6c4b8a3 +ENV TFA_VERSION=v6.2.0 +ENV TFA_SHA256_SUM=afa5ae5c0bc65c8127e92562071c8ca7df0905358be9f47c3090dc75b6b5800f RUN wget https://github.com/nextcloud-releases/twofactor_totp/releases/download/$TFA_VERSION/twofactor_totp.tar.gz RUN echo "$TFA_SHA256_SUM twofactor_totp.tar.gz" | sha256sum -c - || exit 1 RUN mkdir /var/lib/nextcloud/apps/twofactor_totp RUN tar xzf twofactor_totp.tar.gz -C /var/lib/nextcloud/apps/twofactor_totp --strip 1 -ENV U2F_VERSION=v6.2.0 -ENV U2F_SHA256_SUM=c8e3519c4a7639fd229ceb0dc32acccc64ffb6facb6fad946e02afce49023e67 +ENV U2F_VERSION=v6.3.0 +ENV U2F_SHA256_SUM=89c5d3181eb20027fa6b6afc937ace6b52eaff624c5eaaee6b4d59676a3d2d7c RUN wget https://github.com/nextcloud-releases/twofactor_u2f/releases/download/$U2F_VERSION/twofactor_u2f.tar.gz RUN echo "$U2F_SHA256_SUM twofactor_u2f.tar.gz" | sha256sum -c - || exit 1 RUN mkdir /var/lib/nextcloud/apps/twofactor_u2f RUN tar xzf twofactor_u2f.tar.gz -C /var/lib/nextcloud/apps/twofactor_u2f --strip 1 -ENV POLLS_VERSION=3.1.0 -ENV POLLS_SHA256_SUM=16273dc0cd018429f27371ae024c1b0fbd12c16d785dff18dcc2b131a490cbb7 +ENV POLLS_VERSION=3.5.2 +ENV POLLS_SHA256_SUM=c4b68b11dbe910f507985664ddee672e752a59d326d4eb92f70caab512964c1b RUN wget https://github.com/nextcloud/polls/releases/download/v$POLLS_VERSION/polls-$POLLS_VERSION.tar.gz RUN echo "$POLLS_SHA256_SUM polls-$POLLS_VERSION.tar.gz" | sha256sum -c - || exit 1 RUN mkdir /var/lib/nextcloud/apps/polls RUN tar xzf polls-$POLLS_VERSION.tar.gz -C /var/lib/nextcloud/apps/polls --strip 1 -ENV CONTACTS_VERSION=v4.0.1 -ENV CONTACTS_SHA256_SUM=6727e17e262a73ed740e5cdb7499708a5e5b4ddc7f855065b652c3910794789c -RUN wget https://github.com/nextcloud-releases/contacts/releases/download/$CONTACTS_VERSION/contacts.tar.gz -RUN echo "$CONTACTS_SHA256_SUM contacts.tar.gz" | sha256sum -c - || exit 1 +ENV CONTACTS_VERSION=v4.0.7 +ENV CONTACTS_SHA256_SUM=e3518ea6030912f3e4760119fd5c9b2f700290bae21442868d7bf50a83608140 +RUN wget https://github.com/nextcloud-releases/contacts/releases/download/$CONTACTS_VERSION/contacts-$CONTACTS_VERSION.tar.gz +RUN echo "$CONTACTS_SHA256_SUM contacts-$CONTACTS_VERSION.tar.gz" | sha256sum -c - || exit 1 RUN mkdir /var/lib/nextcloud/apps/contacts -RUN tar xzf contacts.tar.gz -C /var/lib/nextcloud/apps/contacts --strip 1 +RUN tar xzf contacts-$CONTACTS_VERSION.tar.gz -C /var/lib/nextcloud/apps/contacts --strip 1 -ENV CALENDAR_VERSION=v2.3.2 -ENV CALENDAR_SHA256_SUM=50ebeacd30ddebf749370e7258990af37e522e8e8101e57e6f2e2510d7fe0b14 -RUN wget https://github.com/nextcloud-releases/calendar/releases/download/$CALENDAR_VERSION/calendar.tar.gz -RUN echo "$CALENDAR_SHA256_SUM calendar.tar.gz" | sha256sum -c - || exit 1 +ENV CALENDAR_VERSION=v3.0.5 +ENV CALENDAR_SHA256_SUM=b9f332d7411c783b578d185bacc25f6223a614249088c26029247c4eedce5954 +RUN wget https://github.com/nextcloud-releases/calendar/releases/download/$CALENDAR_VERSION/calendar-$CALENDAR_VERSION.tar.gz +RUN echo "$CALENDAR_SHA256_SUM calendar-$CALENDAR_VERSION.tar.gz" | sha256sum -c - || exit 1 RUN mkdir /var/lib/nextcloud/apps/calendar -RUN tar xzf calendar.tar.gz -C /var/lib/nextcloud/apps/calendar --strip 1 +RUN tar xzf calendar-$CALENDAR_VERSION.tar.gz -C /var/lib/nextcloud/apps/calendar --strip 1 -ENV TASKS_VERSION=v0.14.1 -ENV TASKS_SHA256_SUM=0326d6b80d7bddf7f015bff5c75725897b26575300b2c2b15c8710e8f4d20d41 +ENV TASKS_VERSION=v0.14.2 +ENV TASKS_SHA256_SUM=591da1d6b8eaa21b7ec65e0ac9ea2fc6ffbdca9ef21931e1dffbdaebb4161988 RUN wget https://github.com/nextcloud/tasks/releases/download/$TASKS_VERSION/tasks.tar.gz RUN echo "$TASKS_SHA256_SUM tasks.tar.gz" | sha256sum -c - || exit 1 RUN mkdir /var/lib/nextcloud/apps/tasks RUN tar xzf tasks.tar.gz -C /var/lib/nextcloud/apps/tasks --strip 1 -ENV NOTES_VERSION=v4.1.1 -ENV NOTES_SHA256_SUM=10800e6d42f8d4976cd80247e7fa6a8f61bca8e2fe8d3c14472d4987b38d003d +ENV NOTES_VERSION=v4.3.0 +ENV NOTES_SHA256_SUM=f8658cc133de4060b34ff2e7d87fbf6d9b7db72cbb55c7636eb15c32fc9d69b0 RUN wget https://github.com/nextcloud/notes/releases/download/$NOTES_VERSION/notes.tar.gz RUN echo "$NOTES_SHA256_SUM notes.tar.gz" | sha256sum -c - || exit 1 RUN mkdir /var/lib/nextcloud/apps/notes RUN tar xzf notes.tar.gz -C /var/lib/nextcloud/apps/notes --strip 1 -ENV NEWS_VERSION=16.0.1 -ENV NEWS_SHA256_SUM=b2ce381307e91759ff2b95a636afec62851246cd01a705ef22330884d31ef6d2 +ENV NEWS_VERSION=17.0.1 +ENV NEWS_SHA256_SUM=0288da3197292d47f171a18e5ebcda83b2d27d089ac3395bfdcc17dec41d657f RUN wget https://github.com/nextcloud/news/releases/download/$NEWS_VERSION/news.tar.gz RUN echo "$NEWS_SHA256_SUM news.tar.gz" | sha256sum -c - || exit 1 RUN mkdir /var/lib/nextcloud/apps/news RUN tar xzf news.tar.gz -C /var/lib/nextcloud/apps/news --strip 1 -ENV MASTODON_INTEGRATION_VERSION=1.0.1 -ENV MASTODON_INTEGRATION_SHA256_SUM=fabfd6078be4a0b0cc7066624705cb1781724839a1a0c1a67c6410a3fda0810d +ENV MASTODON_INTEGRATION_VERSION=1.0.2 +ENV MASTODON_INTEGRATION_SHA256_SUM=819226a25f293da72416c25a3595ef7e93c37f16cdff5cc4b21399de52073c4f RUN wget https://github.com/nextcloud/integration_mastodon/releases/download/v$MASTODON_INTEGRATION_VERSION/integration_mastodon-$MASTODON_INTEGRATION_VERSION.tar.gz RUN echo "$MASTODON_INTEGRATION_SHA256_SUM integration_mastodon-$MASTODON_INTEGRATION_VERSION.tar.gz" | sha256sum -c - || exit 1 RUN mkdir /var/lib/nextcloud/apps/integration_mastodon RUN tar xzf integration_mastodon-$MASTODON_INTEGRATION_VERSION.tar.gz -C /var/lib/nextcloud/apps/integration_mastodon --strip 1 -ENV GITHUB_INTEGRATION_VERSION=1.0.1 -ENV GITHUB_INTEGRATION_SHA256_SUM=4dc38c2d83455cfcd1695c3daeaae5050edfeb8b16c1460140952d652fb156bd +ENV GITHUB_INTEGRATION_VERSION=1.0.2 +ENV GITHUB_INTEGRATION_SHA256_SUM=1ae96fad28e86a35b4780eff3d1b915b12cc45be4140b9ae10cf914456d386e1 RUN wget https://github.com/nextcloud/integration_github/releases/download/v$GITHUB_INTEGRATION_VERSION/integration_github-$GITHUB_INTEGRATION_VERSION.tar.gz RUN echo "$GITHUB_INTEGRATION_SHA256_SUM integration_github-$GITHUB_INTEGRATION_VERSION.tar.gz" | sha256sum -c - || exit 1 RUN mkdir /var/lib/nextcloud/apps/integration_github RUN tar xzf integration_github-$GITHUB_INTEGRATION_VERSION.tar.gz -C /var/lib/nextcloud/apps/integration_github --strip 1 -ENV GITLAB_INTEGRATION_VERSION=1.0.1 -ENV GITLAB_INTEGRATION_SHA256_SUM=569c6b902f72bd3c637397b6419e498a305f3c048533d90de4701777d6c4e7eb +ENV GITLAB_INTEGRATION_VERSION=1.0.3 +ENV GITLAB_INTEGRATION_SHA256_SUM=292a01666abf3b311cacaca27c04550d1ffd884430cab2616ea6e66afd133aa9 RUN wget https://github.com/nextcloud/integration_gitlab/releases/download/v$GITLAB_INTEGRATION_VERSION/integration_gitlab-$GITLAB_INTEGRATION_VERSION.tar.gz RUN echo "$GITLAB_INTEGRATION_SHA256_SUM integration_gitlab-$GITLAB_INTEGRATION_VERSION.tar.gz" | sha256sum -c - || exit 1 RUN mkdir /var/lib/nextcloud/apps/integration_gitlab RUN tar xzf integration_gitlab-$GITLAB_INTEGRATION_VERSION.tar.gz -C /var/lib/nextcloud/apps/integration_gitlab --strip 1 -ENV SOCIAL_LOGIN_VERSION=v4.8.3 -ENV SOCIAL_LOGIN_SHA256_SUM=1aee365291749b1126b1c2661877e79e5fe957527090eec1393d97d16f4774f1 +ENV SOCIAL_LOGIN_VERSION=v4.11.0 +ENV SOCIAL_LOGIN_SHA256_SUM=7c8ff648a699f4c620c74a34465664850ba256fc8203766b34c530ff67cc53e9 RUN wget https://github.com/zorn-v/nextcloud-social-login/releases/download/$SOCIAL_LOGIN_VERSION/release.tar.gz RUN echo "$SOCIAL_LOGIN_SHA256_SUM release.tar.gz" | sha256sum -c - || exit 1 RUN mkdir /var/lib/nextcloud/apps/sociallogin @@ -128,7 +128,10 @@ RUN apk add --no-cache \ php8-exif \ php8-bcmath \ php8-gmp \ - php8-imap + php8-imap \ + dcron + +RUN ln -s /usr/sbin/crond /bin/crond COPY --from=builder --chown=nginx:nginx /var/lib/nextcloud /var/lib/nextcloud diff --git a/rootfs/etc/cont-init.d/00-nextcloud b/rootfs/bin/nextcloud-config old mode 100644 new mode 100755 similarity index 99% rename from rootfs/etc/cont-init.d/00-nextcloud rename to rootfs/bin/nextcloud-config index a5f6989..53cae3a --- a/rootfs/etc/cont-init.d/00-nextcloud +++ b/rootfs/bin/nextcloud-config @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv sh +#!/command/with-contenv sh set -ex cd /var/lib/nextcloud diff --git a/rootfs/etc/fix-attrs.d/01-nextcloud-data-dir b/rootfs/etc/fix-attrs.d/01-nextcloud-data-dir deleted file mode 100644 index 7e2a8a2..0000000 --- a/rootfs/etc/fix-attrs.d/01-nextcloud-data-dir +++ /dev/null @@ -1,2 +0,0 @@ -/var/lib/nextcloud/data true nginx 0640 0750 -/var/lib/nextcloud/config true nginx 0640 0750 diff --git a/rootfs/etc/s6-overlay/s6-rc.d/crond/run b/rootfs/etc/s6-overlay/s6-rc.d/crond/run new file mode 100644 index 0000000..7fbaf2e --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/crond/run @@ -0,0 +1,3 @@ +#!/command/with-contenv sh + +exec crond -f diff --git a/rootfs/etc/s6-overlay/s6-rc.d/crond/type b/rootfs/etc/s6-overlay/s6-rc.d/crond/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/crond/type @@ -0,0 +1 @@ +longrun diff --git a/rootfs/etc/s6-overlay/s6-rc.d/nextcloud-config/type b/rootfs/etc/s6-overlay/s6-rc.d/nextcloud-config/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/nextcloud-config/type @@ -0,0 +1 @@ +oneshot diff --git a/rootfs/etc/s6-overlay/s6-rc.d/nextcloud-config/up b/rootfs/etc/s6-overlay/s6-rc.d/nextcloud-config/up new file mode 100644 index 0000000..84965ff --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/nextcloud-config/up @@ -0,0 +1 @@ +nextcloud-config diff --git a/rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies b/rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies new file mode 100644 index 0000000..9c314f3 --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies @@ -0,0 +1,2 @@ +confd +nextcloud-config diff --git a/rootfs/etc/services.d/nginx/run b/rootfs/etc/s6-overlay/s6-rc.d/nginx/run similarity index 51% rename from rootfs/etc/services.d/nginx/run rename to rootfs/etc/s6-overlay/s6-rc.d/nginx/run index 807d20a..01e2a62 100644 --- a/rootfs/etc/services.d/nginx/run +++ b/rootfs/etc/s6-overlay/s6-rc.d/nginx/run @@ -1,3 +1,3 @@ -#!/usr/bin/with-contenv sh +#!/command/with-contenv sh exec nginx -g "daemon off;" diff --git a/rootfs/etc/s6-overlay/s6-rc.d/nginx/type b/rootfs/etc/s6-overlay/s6-rc.d/nginx/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/nginx/type @@ -0,0 +1 @@ +longrun diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/crond b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/crond new file mode 100644 index 0000000..e69de29 diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/nginx b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/nginx new file mode 100644 index 0000000..e69de29 diff --git a/rootfs/etc/services.d/crond/run b/rootfs/etc/services.d/crond/run deleted file mode 100644 index 160060e..0000000 --- a/rootfs/etc/services.d/crond/run +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/with-contenv sh - -exec crond -f