From a2b887641de1d39baeea2444dccfc53b375d7baa Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Wed, 20 Dec 2023 08:19:46 +0100 Subject: [PATCH] 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