From d24c9028f25eb4b7ac7bae88564cab2d0684e2b3 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Tue, 30 May 2023 10:32:27 +0200 Subject: [PATCH 01/10] configure apcu for php 8.2 --- rootfs/etc/{php81 => php82}/conf.d/enable_apcu_for_cli.ini | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename rootfs/etc/{php81 => php82}/conf.d/enable_apcu_for_cli.ini (100%) diff --git a/rootfs/etc/php81/conf.d/enable_apcu_for_cli.ini b/rootfs/etc/php82/conf.d/enable_apcu_for_cli.ini similarity index 100% rename from rootfs/etc/php81/conf.d/enable_apcu_for_cli.ini rename to rootfs/etc/php82/conf.d/enable_apcu_for_cli.ini From 0348d45eacdca9cd988abf896fd3fa0c9b564578 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Tue, 30 May 2023 10:48:01 +0200 Subject: [PATCH 02/10] use php 8.2 base --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 227c9ee..c76c8b2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -72,7 +72,7 @@ RUN mkdir /var/lib/nextcloud/apps/sociallogin RUN tar xzf release.tar.gz -C /var/lib/nextcloud/apps/sociallogin --strip 1 -FROM docker.io/thallian/php8-fpm:3.18 +FROM docker.io/thallian/php8-fpm:3.18-8.2 ENV FPMUSER=nginx ENV FPMGROUP=nginx @@ -109,6 +109,7 @@ RUN apk add --no-cache \ php82-bcmath \ php82-gmp \ php82-imap \ + php82-pdo \ dcron RUN ln -s /usr/bin/php82 /usr/bin/php From f5773bcd6ecc71fc692c3bc39a2178fede9cd835 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Tue, 30 May 2023 12:07:23 +0200 Subject: [PATCH 03/10] remove twofactor_totp, it's no longer maintained --- Dockerfile | 8 -------- rootfs/bin/nextcloud-config | 25 ++++++++++++------------- 2 files changed, 12 insertions(+), 21 deletions(-) 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 From 02179e76c313087a4c326e3d965439e5cd09f6c1 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Wed, 16 Aug 2023 08:11:20 +0200 Subject: [PATCH 04/10] push to 27.0.2 --- Dockerfile | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3968744..1b3e8f9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,28 +1,28 @@ FROM docker.io/alpine:3.18 AS builder -ENV NC_VERSION=26.0.2 -ENV NC_SHA256_SUM=f3db0ec5e0aaff7c088eb34f752d77d79913bc6784e0fc47a84cdaa28e567a33 +ENV NC_VERSION=27.0.2 +ENV NC_SHA256_SUM=7a2dcea43aa3b8fb303347efda4c6f37733cca113c8ee16dd9f0e5fb68c7212f 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 POLLS_VERSION=5.0.5 -ENV POLLS_SHA256_SUM=48adf460a65e8adf58561886df0454cda4a642bcd0d3ccc561ef05d25b6a810e +ENV POLLS_VERSION=5.2.0 +ENV POLLS_SHA256_SUM=e28692b86fdcf3c13634716de3110001e52f13d11fcfd33c4692652732e914f8 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=v5.2.0 -ENV CONTACTS_SHA256_SUM=d557d9a8b5e66321eb14c21e27f4bc0a7a6a0c88869d75be304ea0abb7c5aeec +ENV CONTACTS_VERSION=v5.3.2 +ENV CONTACTS_SHA256_SUM=d6343ea722c13d4ec8e3048f9267b326aeee92b421f163c4ac6e09e8fb372d1e 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-$CONTACTS_VERSION.tar.gz -C /var/lib/nextcloud/apps/contacts --strip 1 -ENV CALENDAR_VERSION=v4.3.4 -ENV CALENDAR_SHA256_SUM=1a0e4c9a21f7a52a1ebff9f1098d5fb5e28dad4c4cd96bc35b24c50fe4fbc848 +ENV CALENDAR_VERSION=v4.4.4 +ENV CALENDAR_SHA256_SUM=f147873a981b51fda81c73af2cde7cbfaf10bf20d84179128ec54a9fa506ac65 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 @@ -35,15 +35,15 @@ 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.7.2 -ENV NOTES_SHA256_SUM=85b6f781547bab94772326e869c41b8c8443c7d05dc2a6e520acafd8e262aa0b +ENV NOTES_VERSION=v4.8.1 +ENV NOTES_SHA256_SUM=05f1f55beed358a651b80021290110b65bfc78f4ed250bd941530cbb7cd42d1e 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=21.2.0 -ENV NEWS_SHA256_SUM=aee2a0df43d0f14ac64414aa3f46a5c20e2817ee813351f3db14271da031a375 +ENV NEWS_VERSION=22.0.0 +ENV NEWS_SHA256_SUM=5114977613fabe06120013d0746648b9c40507e3dbbbcdf02a3b9281d3a852d1 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 @@ -102,7 +102,7 @@ RUN apk add --no-cache \ php82-gmp \ php82-imap \ php82-pdo \ - dcron + dcron RUN ln -s /usr/bin/php82 /usr/bin/php From 7d4c37f567ef8c7d80eb50d84200a7ebb9ab20f7 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Tue, 26 Sep 2023 15:35:34 +0200 Subject: [PATCH 05/10] push to 27.1.1 --- Dockerfile | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1b3e8f9..96c39d9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,28 +1,28 @@ FROM docker.io/alpine:3.18 AS builder -ENV NC_VERSION=27.0.2 -ENV NC_SHA256_SUM=7a2dcea43aa3b8fb303347efda4c6f37733cca113c8ee16dd9f0e5fb68c7212f +ENV NC_VERSION=27.1.1 +ENV NC_SHA256_SUM=3a91500566874675676fa3b5bfae2587a839cde41dfac5318043b162c1311fab 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 POLLS_VERSION=5.2.0 -ENV POLLS_SHA256_SUM=e28692b86fdcf3c13634716de3110001e52f13d11fcfd33c4692652732e914f8 +ENV POLLS_VERSION=5.3.2 +ENV POLLS_SHA256_SUM=5b6aa085cd53a54fca9f53dbd733eeba064e4b020f7cd4cf97895de6fdd5d62d 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=v5.3.2 -ENV CONTACTS_SHA256_SUM=d6343ea722c13d4ec8e3048f9267b326aeee92b421f163c4ac6e09e8fb372d1e +ENV CONTACTS_VERSION=v5.4.2 +ENV CONTACTS_SHA256_SUM=365a9229094d8b205ea6d84c792f3db51358bd3b4176ef8f38d104b7c3abb8a1 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-$CONTACTS_VERSION.tar.gz -C /var/lib/nextcloud/apps/contacts --strip 1 -ENV CALENDAR_VERSION=v4.4.4 -ENV CALENDAR_SHA256_SUM=f147873a981b51fda81c73af2cde7cbfaf10bf20d84179128ec54a9fa506ac65 +ENV CALENDAR_VERSION=v4.5.1 +ENV CALENDAR_SHA256_SUM=20543149da1b3e71b366e97faa246810d90469093440416521e36c95597f8401 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 @@ -42,22 +42,15 @@ 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=22.0.0 -ENV NEWS_SHA256_SUM=5114977613fabe06120013d0746648b9c40507e3dbbbcdf02a3b9281d3a852d1 +ENV NEWS_VERSION=23.0.0 +ENV NEWS_SHA256_SUM=a0f50e0a0253168a70494eaf114eaaf8c103938709276cb92f2f245f7239499d 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=2.0.1 -ENV MASTODON_INTEGRATION_SHA256_SUM=cef5aeb0176d050c6e1d82dd4db3113db4cb5784372b5c875f6aa6cb6419b3b8 -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 SOCIAL_LOGIN_VERSION=v5.4.3 -ENV SOCIAL_LOGIN_SHA256_SUM=f9589d72620b9fca0457576b40b663f6a810d3d8443dee44cb1972f35e4b3e54 +ENV SOCIAL_LOGIN_VERSION=v5.5.3 +ENV SOCIAL_LOGIN_SHA256_SUM=b967a2f96e6dadda0a0523a21156612a25483c5abbe04b2b4146ff5cb643bd75 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 From 9c0a7d8d1db2ba5ab01f5182a122617d7e3e7f4b Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Tue, 24 Oct 2023 09:57:50 +0200 Subject: [PATCH 06/10] push to 27.1.2 --- Dockerfile | 16 ++++++++-------- rootfs/bin/nextcloud-config | 25 ++++++++++++------------- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/Dockerfile b/Dockerfile index 96c39d9..5cbaf4c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM docker.io/alpine:3.18 AS builder -ENV NC_VERSION=27.1.1 -ENV NC_SHA256_SUM=3a91500566874675676fa3b5bfae2587a839cde41dfac5318043b162c1311fab +ENV NC_VERSION=27.1.2 +ENV NC_SHA256_SUM=0742b247aaee0b7044db0062f0a914aa77338c7a7d8fe7da0917147d76689721 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 @@ -21,8 +21,8 @@ RUN echo "$CONTACTS_SHA256_SUM contacts-$CONTACTS_VERSION.tar.gz" | sha256sum - RUN mkdir /var/lib/nextcloud/apps/contacts RUN tar xzf contacts-$CONTACTS_VERSION.tar.gz -C /var/lib/nextcloud/apps/contacts --strip 1 -ENV CALENDAR_VERSION=v4.5.1 -ENV CALENDAR_SHA256_SUM=20543149da1b3e71b366e97faa246810d90469093440416521e36c95597f8401 +ENV CALENDAR_VERSION=v4.5.2 +ENV CALENDAR_SHA256_SUM=6279967f9c9ba473261d12cae6e253b45fc30fc3490e70ed4ab07124d036d2ed 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 @@ -42,15 +42,15 @@ 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=23.0.0 -ENV NEWS_SHA256_SUM=a0f50e0a0253168a70494eaf114eaaf8c103938709276cb92f2f245f7239499d +ENV NEWS_VERSION=24.0.0 +ENV NEWS_SHA256_SUM=1ee6e69bdac9099261ab20a3eab19502d4d1a667d32f6565cfe4e842b525d369 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 SOCIAL_LOGIN_VERSION=v5.5.3 -ENV SOCIAL_LOGIN_SHA256_SUM=b967a2f96e6dadda0a0523a21156612a25483c5abbe04b2b4146ff5cb643bd75 +ENV SOCIAL_LOGIN_VERSION=v5.5.4 +ENV SOCIAL_LOGIN_SHA256_SUM=4a04c24ca22fb7fd92e896289de633f2387e074b51cb83f654b0ad03973c72cb 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 diff --git a/rootfs/bin/nextcloud-config b/rootfs/bin/nextcloud-config index 4962b3d..6cb84b8 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 @@ -34,7 +34,6 @@ s6-setuidgid nginx ./occ app:enable news s6-setuidgid nginx ./occ app:enable tasks s6-setuidgid nginx ./occ app:enable notes s6-setuidgid nginx ./occ app:enable sociallogin -s6-setuidgid nginx ./occ app:enable integration_mastodon s6-setuidgid nginx ./occ app:disable activity s6-setuidgid nginx ./occ app:disable comments s6-setuidgid nginx ./occ app:disable files_trashbin From a2b887641de1d39baeea2444dccfc53b375d7baa Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Wed, 20 Dec 2023 08:19:46 +0100 Subject: [PATCH 07/10] push to version 28.0.0 --- .gitea/workflows/container.yaml | 12 +++++ .woodpecker.yml | 11 ---- Dockerfile => Containerfile | 92 ++++++++++++++++----------------- 3 files changed, 58 insertions(+), 57 deletions(-) create mode 100644 .gitea/workflows/container.yaml delete mode 100644 .woodpecker.yml rename Dockerfile => Containerfile (67%) diff --git a/.gitea/workflows/container.yaml b/.gitea/workflows/container.yaml new file mode 100644 index 0000000..e48b3fd --- /dev/null +++ b/.gitea/workflows/container.yaml @@ -0,0 +1,12 @@ +name: Build Multiarch Container Image +on: [push] +jobs: + call-reusable-workflow: + uses: container/multiarch-build-workflow/.gitea/workflows/build.yaml@main + with: + repository: ${{ gitea.repository }} + ref_name: ${{ gitea.ref_name }} + sha: ${{ gitea.sha }} + registry_url: ${{ secrets.REGISTRY_URL }} + registry_user: ${{ secrets.REGISTRY_USER }} + registry_pw: ${{ secrets.REGISTRY_PW }} diff --git a/.woodpecker.yml b/.woodpecker.yml deleted file mode 100644 index c807c1c..0000000 --- a/.woodpecker.yml +++ /dev/null @@ -1,11 +0,0 @@ -pipeline: - publish-docker-image: - image: plugins/kaniko - settings: - repo: docker.io/thallian/nextcloud - tags: latest,${CI_COMMIT_SHA:0:8},${CI_COMMIT_TAG=pre} - dockerfile: Dockerfile - username: - from_secret: DOCKER_USER - password: - from_secret: DOCKER_PW \ No newline at end of file diff --git a/Dockerfile b/Containerfile similarity index 67% rename from Dockerfile rename to Containerfile index 5cbaf4c..9a5dcdf 100644 --- a/Dockerfile +++ b/Containerfile @@ -1,28 +1,28 @@ -FROM docker.io/alpine:3.18 AS builder +FROM docker.io/alpine:3.19 AS builder -ENV NC_VERSION=27.1.2 -ENV NC_SHA256_SUM=0742b247aaee0b7044db0062f0a914aa77338c7a7d8fe7da0917147d76689721 +ENV NC_VERSION=28.0.0 +ENV NC_SHA256_SUM=4e8b0b74b40221e85f92ab869d0873c69a52d7e43889d9259c6259428a6a36f2 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 POLLS_VERSION=5.3.2 -ENV POLLS_SHA256_SUM=5b6aa085cd53a54fca9f53dbd733eeba064e4b020f7cd4cf97895de6fdd5d62d +ENV POLLS_VERSION=6.0.1 +ENV POLLS_SHA256_SUM=37aca3da42b768b50baa655772f371b0606f60ffa315b6a522a57bedcefad46d 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=v5.4.2 -ENV CONTACTS_SHA256_SUM=365a9229094d8b205ea6d84c792f3db51358bd3b4176ef8f38d104b7c3abb8a1 +ENV CONTACTS_VERSION=v5.5.0 +ENV CONTACTS_SHA256_SUM=c6d9d165dea9e4cab579ccebba1de482bf6cd7ce0cb73d0ef6fcda6818760d26 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-$CONTACTS_VERSION.tar.gz -C /var/lib/nextcloud/apps/contacts --strip 1 -ENV CALENDAR_VERSION=v4.5.2 -ENV CALENDAR_SHA256_SUM=6279967f9c9ba473261d12cae6e253b45fc30fc3490e70ed4ab07124d036d2ed +ENV CALENDAR_VERSION=v4.6.0 +ENV CALENDAR_SHA256_SUM=615161d78a29b2502eec6e117a70f49b38123cb4d9de150166914d41134ce07f 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 @@ -35,29 +35,29 @@ 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.8.1 -ENV NOTES_SHA256_SUM=05f1f55beed358a651b80021290110b65bfc78f4ed250bd941530cbb7cd42d1e +ENV NOTES_VERSION=v4.9.1 +ENV NOTES_SHA256_SUM=6af4cea1ab1f0cd34e270af3b32675da4dfaa9c8cbe225834746527927b42d94 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=24.0.0 -ENV NEWS_SHA256_SUM=1ee6e69bdac9099261ab20a3eab19502d4d1a667d32f6565cfe4e842b525d369 +ENV NEWS_VERSION=25.0.0-alpha2 +ENV NEWS_SHA256_SUM=f3002b71bdeeaa5c64099adf60f01abfb3178737da242aa990d2a79516705bf7 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 SOCIAL_LOGIN_VERSION=v5.5.4 -ENV SOCIAL_LOGIN_SHA256_SUM=4a04c24ca22fb7fd92e896289de633f2387e074b51cb83f654b0ad03973c72cb +ENV SOCIAL_LOGIN_VERSION=v5.6.1 +ENV SOCIAL_LOGIN_SHA256_SUM=3c1b4d62a7b88c06cc8ca90d38bb6b550d40d61a30b8b1463e4ba27a5a125b6a 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 RUN tar xzf release.tar.gz -C /var/lib/nextcloud/apps/sociallogin --strip 1 -FROM docker.io/thallian/php8-fpm:3.18-8.2 +FROM docker.io/thallian/php8-fpm:3.19-8.3 ENV FPMUSER=nginx ENV FPMGROUP=nginx @@ -66,38 +66,38 @@ ENV PHP_MEMORY_LIMIT=512M RUN apk add --no-cache \ nginx \ ffmpeg \ - php82-cli \ - php82-pecl-apcu \ - php82-opcache \ - php82-pcntl \ - php82-ctype \ - php82-curl \ - php82-dom \ - php82-gd \ - php82-iconv \ - php82-xml \ - php82-json \ - php82-mbstring \ - php82-openssl \ - php82-posix \ - php82-session \ - php82-simplexml \ - php82-xmlreader \ - php82-xmlwriter \ - php82-zip \ - php82-zlib \ - php82-pdo_pgsql \ - php82-bz2 \ - php82-fileinfo \ - php82-intl \ - php82-exif \ - php82-bcmath \ - php82-gmp \ - php82-imap \ - php82-pdo \ + php83-cli \ + php83-pecl-apcu \ + php83-opcache \ + php83-pcntl \ + php83-ctype \ + php83-curl \ + php83-dom \ + php83-gd \ + php83-iconv \ + php83-xml \ + php83-json \ + php83-mbstring \ + php83-openssl \ + php83-posix \ + php83-session \ + php83-simplexml \ + php83-xmlreader \ + php83-xmlwriter \ + php83-zip \ + php83-zlib \ + php83-pdo_pgsql \ + php83-bz2 \ + php83-fileinfo \ + php83-intl \ + php83-exif \ + php83-bcmath \ + php83-gmp \ + php83-imap \ + php83-pdo \ dcron -RUN ln -s /usr/bin/php82 /usr/bin/php +RUN ln -s /usr/bin/php83 /usr/bin/php COPY --from=builder --chown=nginx:nginx /var/lib/nextcloud /var/lib/nextcloud From 5c9d8e11f3a17e7c6f3359bfc6dadb57bcd3960c Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Wed, 20 Dec 2023 09:15:54 +0100 Subject: [PATCH 08/10] disable notes for now as it is not yet compatible with NC28 --- rootfs/bin/nextcloud-config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rootfs/bin/nextcloud-config b/rootfs/bin/nextcloud-config index 6cb84b8..6008452 100755 --- a/rootfs/bin/nextcloud-config +++ b/rootfs/bin/nextcloud-config @@ -32,7 +32,7 @@ s6-setuidgid nginx ./occ app:enable calendar s6-setuidgid nginx ./occ app:enable contacts s6-setuidgid nginx ./occ app:enable news s6-setuidgid nginx ./occ app:enable tasks -s6-setuidgid nginx ./occ app:enable notes +# s6-setuidgid nginx ./occ app:enable notes s6-setuidgid nginx ./occ app:enable sociallogin s6-setuidgid nginx ./occ app:disable activity s6-setuidgid nginx ./occ app:disable comments From 0be15a43ffd1b680710ce17cb1b7bb2892bb6493 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Wed, 20 Dec 2023 09:26:14 +0100 Subject: [PATCH 09/10] enable apcu for cli --- rootfs/etc/{php82 => php83}/conf.d/enable_apcu_for_cli.ini | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename rootfs/etc/{php82 => php83}/conf.d/enable_apcu_for_cli.ini (100%) diff --git a/rootfs/etc/php82/conf.d/enable_apcu_for_cli.ini b/rootfs/etc/php83/conf.d/enable_apcu_for_cli.ini similarity index 100% rename from rootfs/etc/php82/conf.d/enable_apcu_for_cli.ini rename to rootfs/etc/php83/conf.d/enable_apcu_for_cli.ini From 13852076735f0a04345b3d6995960c60c758674d Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Thu, 28 Mar 2024 14:43:19 +0100 Subject: [PATCH 10/10] push to 28.0.4 --- Containerfile | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Containerfile b/Containerfile index 9a5dcdf..de7bdb5 100644 --- a/Containerfile +++ b/Containerfile @@ -1,28 +1,28 @@ FROM docker.io/alpine:3.19 AS builder -ENV NC_VERSION=28.0.0 -ENV NC_SHA256_SUM=4e8b0b74b40221e85f92ab869d0873c69a52d7e43889d9259c6259428a6a36f2 +ENV NC_VERSION=28.0.4 +ENV NC_SHA256_SUM=9bfecee1e12fba48c49e9a71caa81c4ba10b2884787fab75d64ccfd122a13019 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 POLLS_VERSION=6.0.1 -ENV POLLS_SHA256_SUM=37aca3da42b768b50baa655772f371b0606f60ffa315b6a522a57bedcefad46d +ENV POLLS_VERSION=7.0.0 +ENV POLLS_SHA256_SUM=b91f6b4f687bc15b264cfb8b602e5ecc5304c5ccacc3d206ec421472685e5a7f 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=v5.5.0 -ENV CONTACTS_SHA256_SUM=c6d9d165dea9e4cab579ccebba1de482bf6cd7ce0cb73d0ef6fcda6818760d26 +ENV CONTACTS_VERSION=v5.5.3 +ENV CONTACTS_SHA256_SUM=cf19a03228b3cd719f45e452f5727e7dbead2512c7fd9e4dbee2e9b296004452 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-$CONTACTS_VERSION.tar.gz -C /var/lib/nextcloud/apps/contacts --strip 1 -ENV CALENDAR_VERSION=v4.6.0 -ENV CALENDAR_SHA256_SUM=615161d78a29b2502eec6e117a70f49b38123cb4d9de150166914d41134ce07f +ENV CALENDAR_VERSION=v4.6.7 +ENV CALENDAR_SHA256_SUM=3078c780c31627ccda418529ba875f91819531c7b000013b13a7d20339f7d740 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 @@ -35,22 +35,22 @@ 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.9.1 -ENV NOTES_SHA256_SUM=6af4cea1ab1f0cd34e270af3b32675da4dfaa9c8cbe225834746527927b42d94 +ENV NOTES_VERSION=v4.9.4 +ENV NOTES_SHA256_SUM=2ef524020b08fd0e7bfe6cce9ba7bebdf293b03e9b7f30808a96984b769871b8 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=25.0.0-alpha2 -ENV NEWS_SHA256_SUM=f3002b71bdeeaa5c64099adf60f01abfb3178737da242aa990d2a79516705bf7 +ENV NEWS_VERSION=25.0.0-alpha4 +ENV NEWS_SHA256_SUM=f5ec5fb60d414bda5325e29d273b745f35e51510cd64287c6818240be7b8d337 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 SOCIAL_LOGIN_VERSION=v5.6.1 -ENV SOCIAL_LOGIN_SHA256_SUM=3c1b4d62a7b88c06cc8ca90d38bb6b550d40d61a30b8b1463e4ba27a5a125b6a +ENV SOCIAL_LOGIN_VERSION=v5.6.4 +ENV SOCIAL_LOGIN_SHA256_SUM=648af2d41d965c8458351c3434b0016da75f7e17c7f8c194b621c724b72ce26f 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