bump nextcloud 25.0.3

This reverts commit e6c537fc78.

.drone.yml

@@ -1,14 +1,72 @@
 kind: pipeline
 type: kubernetes
-name: default
+name: build-arm64
+
+node_selector:
+  kubernetes.io/arch: arm64
 
 steps:
-- name: docker  
+- name: docker build
   image: plugins/docker
   settings:
-    repo: badjware/nextcloud-tweak
-    auto_tag: true
+    repo: ${DRONE_REPO}
+    tag: ${DRONE_COMMIT_SHA:0:8}-arm64
+    # docker use a mtu of 1500 by default, which may cause packet drop in k8s
+    mtu: 1450
     username:
       from_secret: docker_username
     password:
-      from_secret: docker_password
+      from_secret: docker_password
+---
+kind: pipeline
+type: kubernetes
+name: build-amd64
+
+node_selector:
+  kubernetes.io/arch: amd64
+
+steps:
+- name: docker build
+  image: plugins/docker
+  settings:
+    repo: ${DRONE_REPO}
+    tag: ${DRONE_COMMIT_SHA:0:8}-amd64
+    # docker use a mtu of 1500 by default, which may cause packet drop in k8s
+    mtu: 1450
+    username:
+      from_secret: docker_username
+    password:
+      from_secret: docker_password
+---
+kind: pipeline
+type: kubernetes
+name: create-multiarch-manifest
+
+steps:
+  - name: docker manifest
+    image: docker:20-dind-rootless
+    commands:
+      - docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD"
+      - docker manifest create ${DRONE_REPO}:${DRONE_TAG:-latest} --amend ${DRONE_REPO}:${DRONE_COMMIT_SHA:0:8}-amd64 --amend ${DRONE_REPO}:${DRONE_COMMIT_SHA:0:8}-arm64
+      - docker manifest push ${DRONE_REPO}:${DRONE_TAG:-latest}
+    environment: 
+      DOCKER_USERNAME:
+        from_secret: docker_username
+      DOCKER_PASSWORD:
+        from_secret: docker_password
+  - name: cleanup
+    image: alpine
+    commands:
+      - apk add curl jq
+      - 'DOCKER_TOKEN="$(curl -sf -XPOST -H "Content-Type: application/json" -d "{\"username\":\"$DOCKER_USERNAME\",\"password\":\"$DOCKER_PASSWORD\"}" https://hub.docker.com/v2/users/login | jq --raw-output .token)"'
+      - 'curl -sf -XDELETE -H "Accept: application/json" -H "Authorization: Bearer $DOCKER_TOKEN" https://hub.docker.com/v2/repositories/${DRONE_REPO}/tags/${DRONE_COMMIT_SHA:0:8}-arm64/'
+      - 'curl -sf -XDELETE -H "Accept: application/json" -H "Authorization: Bearer $DOCKER_TOKEN" https://hub.docker.com/v2/repositories/${DRONE_REPO}/tags/${DRONE_COMMIT_SHA:0:8}-amd64/'
+    environment: 
+      DOCKER_USERNAME:
+        from_secret: docker_username
+      DOCKER_PASSWORD:
+        from_secret: docker_password
+
+depends_on:
+  - build-arm64
+  - build-amd64

Dockerfile

@@ -1,8 +1,17 @@
-FROM nextcloud:22.1.1
+FROM nextcloud:25.0.3-apache
 
-COPY httpd/000-default.conf /etc/apache2/sites-available/000-default.conf
+COPY supervisord/supervisord.conf /opt/supervisord.conf
 
-# install cron
-RUN apt-get update && \
-    apt-get install -y cron libmagickcore-6.q16-6-extra && \
-    rm -rf /var/lib/apt/lists/*
+RUN apt-get update \
+ && apt-get install -y --no-install-recommends \
+        ffmpeg \
+        libmagickcore-6.q16-6-extra \
+        procps \
+        smbclient \
+        supervisor \
+ && mkdir /var/log/supervisord /var/run/supervisord \
+ && rm -rf /var/lib/apt/lists/*
+
+ENV NEXTCLOUD_UPDATE=1
+
+CMD ["/usr/bin/supervisord", "-c", "/opt/supervisord.conf"]

Makefile

@@ -0,0 +1,3 @@
+.PHONY: amd64
+amd64:
+	drone exec --pipeline amd64

httpd/000-default.conf

@@ -1,37 +0,0 @@
-<VirtualHost *:80>
-        # The ServerName directive sets the request scheme, hostname and port that
-        # the server uses to identify itself. This is used when creating
-        # redirection URLs. In the context of virtual hosts, the ServerName
-        # specifies what hostname must appear in the request's Host: header to
-        # match this virtual host. For the default virtual host (this file) this
-        # value is not decisive as it is used as a last resort host regardless.
-        # However, you must set it for any further virtual host explicitly.
-        #ServerName www.example.com
-
-        ServerAdmin webmaster@localhost
-        DocumentRoot /var/www/html
-
-        # Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
-        # error, crit, alert, emerg.
-        # It is also possible to configure the loglevel for particular
-        # modules, e.g.
-        #LogLevel info ssl:warn
-
-        ErrorLog ${APACHE_LOG_DIR}/error.log
-        CustomLog ${APACHE_LOG_DIR}/access.log combined
-
-        # For most configuration files from conf-available/, which are
-        # enabled or disabled at a global level, it is possible to
-        # include a line for only one particular virtual host. For example the
-        # following line enables the CGI configuration for this host only
-        # after it has been globally disabled with "a2disconf".
-        #Include conf-available/serve-cgi-bin.conf
-
-        <IfModule mod_rewrite.c>
-            RewriteEngine on
-            RewriteRule ^\.well-known/carddav /nextcloud/remote.php/dav [R=301,L]
-            RewriteRule ^\.well-known/caldav /nextcloud/remote.php/dav [R=301,L]
-        </IfModule>
-</VirtualHost>
-
-# vim: syntax=apache ts=4 sw=4 sts=4 sr noet

supervisord/supervisord.conf

@@ -0,0 +1,23 @@
+[supervisord]
+nodaemon=true
+user=root
+logfile=/var/log/supervisord/supervisord.log
+pidfile=/var/run/supervisord/supervisord.pid
+childlogdir=/var/log/supervisord/
+logfile_maxbytes=50MB
+logfile_backups=3
+loglevel=error
+
+[program:apache2]
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+command=apache2-foreground
+
+[program:cron]
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+command=/cron.sh