Merge pull request #12 from Penner4242/master

Update for Nextcloud version 31

- adjusted drone YML
- upgrade s6 overlay 3.1.5.0 -> 3.2.1.0
- nginx.conf.patch merged upstream changes

.drone.yml

@@ -154,6 +154,21 @@ steps:
     build_args:
       - NC_VERSION=30-fpm-alpine
 
+- name: nextcloud 31
+  image: plugins/docker
+  when:
+    branch:
+    - master
+  settings:
+    repo: yavook/kiwi-nextcloud
+    tags: 31
+    username:
+      from_secret: DOCKER_USERNAME
+    password:
+      from_secret: DOCKER_PASSWORD
+    build_args:
+      - NC_VERSION=31-fpm-alpine
+
 - name: parallelism provider
   image: alpine
   depends_on:
@@ -167,3 +182,4 @@ steps:
     - nextcloud 28
     - nextcloud 29
     - nextcloud 30
+    - nextcloud 31

Dockerfile

@@ -7,7 +7,7 @@ LABEL maintainer="jmm@yavook.de"
 # https://github.com/just-containers/s6-overlay
 #########
 
-ARG S6_OVERLAY_VERSION=3.1.5.0
+ARG S6_OVERLAY_VERSION=3.2.1.0
 ENV PATH=/command:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
 RUN set -ex; \

nginx/nginx.conf.patch

@@ -1,10 +1,10 @@
---- a/nginx.conf	2022-03-10 00:55:28.560012495 +0100
+--- a/nginx.conf
-+++ b/nginx.conf	2022-03-10 01:13:07.179416962 +0100
++++ b/nginx.conf
-@@ -27,9 +27,15 @@
+@@ -41,9 +41,15 @@
-     #gzip  on;
+     resolver 127.0.0.11 valid=2s;
- 
      upstream php-handler {
--        server app:9000;
+         zone backends 64k;
+-        server app:9000 resolve;
 +        server 127.0.0.1:9000;
      }
  
@@ -16,4 +16,3 @@
 +
      server {
          listen 80;
-