Push version to 12.0.0

Dockerfile

@@ -3,7 +3,7 @@ FROM quay.io/thallian/php7-fpm:latest
 ENV FPMUSER nginx
 ENV FPMGROUP nginx
 
-ENV VERSION 11.0.1
+ENV VERSION 12.0.0
     
 RUN apk add --no-cache  \
     libressl \
@@ -35,8 +35,6 @@ RUN apk add --no-cache  \
     php7-apcu \
     php7-ldap
 
-RUN ln -s /usr/bin/php7 /usr/bin/php
-
 RUN mkdir /var/lib/nextcloud
 RUN wget -qO- https://download.nextcloud.com/server/releases/nextcloud-$VERSION.tar.bz2 | tar xj -C /var/lib/nextcloud --strip 1
 

rootfs/etc/confd/conf.d/nextcloud.conf.toml

@@ -0,0 +1,3 @@
+[template]
+src = "nextcloud.conf.tmpl"
+dest = "/etc/nginx/conf.d/nextcloud.conf"

rootfs/etc/confd/conf.d/nginx.conf.toml

@@ -1,3 +0,0 @@
-[template]
-src = "nginx.conf.tmpl"
-dest = "/etc/nginx/nginx.conf"

rootfs/etc/confd/templates/config.php.tmpl

@@ -53,5 +53,5 @@ $CONFIG = array(
 'assetdirectory' => '/var/lib/nextcloud',
 'mount_file' => '/var/lib/nextcloud/data/mount.json',
 'installed' => true,
-'version' => '11.0.1.2',
+'version' => '12.0.0',
 );

rootfs/etc/confd/templates/nextcloud.conf.tmpl

@@ -0,0 +1,91 @@
+upstream php {
+    server 127.0.0.1:9000;
+}
+
+server {
+    listen 80;
+
+    server_name {{getenv "DOMAIN"}};
+
+    add_header X-Content-Type-Options nosniff;
+    add_header X-Frame-Options "SAMEORIGIN";
+    add_header X-XSS-Protection "1; mode=block";
+    add_header X-Robots-Tag none;
+    add_header X-Download-Options noopen;
+    add_header X-Permitted-Cross-Domain-Policies none;
+
+    root /var/lib/nextcloud/;
+
+    location = /robots.txt {
+        allow all;
+        log_not_found off;
+        access_log off;
+    }
+
+    location = /.well-known/carddav { 
+        return 301 $scheme://$host/remote.php/dav; 
+    }
+        
+    location = /.well-known/caldav { 
+        return 301 $scheme://$host/remote.php/dav; 
+    }
+
+    location /.well-known/acme-challenge { }
+
+    client_max_body_size {{getenv "MAX_UPLOAD_SIZE"}};
+    fastcgi_buffers 64 4K;
+
+    error_page 403 /core/templates/403.php;
+    error_page 404 /core/templates/404.php;
+
+    location / {
+        rewrite ^ /index.php$uri;
+    }
+
+    location ~ ^/(?:build|tests|config|lib|3rdparty|templates|data)/ {
+        deny all;
+    }
+
+    location ~ ^/(?:\.|autotest|occ|issue|indie|db_|console) {
+        deny all;
+    }
+
+    location ~ ^/(?:index|remote|public|cron|core/ajax/update|status|ocs/v[12]|updater/.+|ocs-provider/.+|core/templates/40[34])\.php(?:$|/) {
+        include fastcgi_params;
+        fastcgi_split_path_info ^(.+\.php)(/.+)$;
+        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+        fastcgi_param PATH_INFO $fastcgi_path_info;
+        fastcgi_param HTTPS on;
+        
+        #Avoid sending the security headers twice
+        fastcgi_param modHeadersAvailable true;
+        fastcgi_param front_controller_active true;
+        fastcgi_pass php;
+        fastcgi_intercept_errors on;
+        fastcgi_request_buffering off;
+    }
+
+    location ~ ^/(?:updater|ocs-provider)(?:$|/) {
+        try_files $uri/ =404;
+        index index.php;
+    }
+
+    location ~* \.(?:css|js)$ {
+        try_files $uri /index.php$uri$is_args$args;
+        add_header Cache-Control "public, max-age=7200";
+        add_header X-Content-Type-Options nosniff;
+        add_header X-Frame-Options "SAMEORIGIN";
+        add_header X-XSS-Protection "1; mode=block";
+        add_header X-Robots-Tag none;
+        add_header X-Download-Options noopen;
+        add_header X-Permitted-Cross-Domain-Policies none;
+    
+        # Optional: Don't log access to assets
+        access_log off;
+    }
+
+    location ~* \.(?:svg|gif|png|html|ttf|woff|ico|jpg|jpeg)$ {
+        try_files $uri /index.php$uri$is_args$args;
+        access_log off;
+    }
+}

rootfs/etc/confd/templates/nginx.conf.tmpl

@@ -1,106 +0,0 @@
-worker_processes  1;
-
-events {
-    worker_connections 1024;
-}
-
-http {
-    include mime.types;
-    default_type application/octet-stream;
-
-    sendfile off;
-
-    keepalive_timeout 65;
-
-    gzip off;
-
-    upstream php {
-        server 127.0.0.1:9000;
-    }
-
-    server {
-        listen 80;
-
-        server_name {{getenv "DOMAIN"}};
-
-        add_header X-Content-Type-Options nosniff;
-        add_header X-Frame-Options "SAMEORIGIN";
-        add_header X-XSS-Protection "1; mode=block";
-        add_header X-Robots-Tag none;
-        add_header X-Download-Options noopen;
-        add_header X-Permitted-Cross-Domain-Policies none;
-
-        root /var/lib/nextcloud/;
-
-        location = /robots.txt {
-            allow all;
-            log_not_found off;
-            access_log off;
-        }
-
-        location = /.well-known/carddav { 
-            return 301 $scheme://$host/remote.php/dav; 
-        }
-        
-        location = /.well-known/caldav { 
-            return 301 $scheme://$host/remote.php/dav; 
-        }
-
-        location /.well-known/acme-challenge { }
-
-        client_max_body_size {{getenv "MAX_UPLOAD_SIZE"}};
-        fastcgi_buffers 64 4K;
-
-        error_page 403 /core/templates/403.php;
-        error_page 404 /core/templates/404.php;
-
-        location / {
-            rewrite ^ /index.php$uri;
-        }
-
-        location ~ ^/(?:build|tests|config|lib|3rdparty|templates|data)/ {
-            deny all;
-        }
-
-        location ~ ^/(?:\.|autotest|occ|issue|indie|db_|console) {
-            deny all;
-        }
-
-        location ~ ^/(?:index|remote|public|cron|core/ajax/update|status|ocs/v[12]|updater/.+|ocs-provider/.+|core/templates/40[34])\.php(?:$|/) {
-            include fastcgi_params;
-            fastcgi_split_path_info ^(.+\.php)(/.+)$;
-            fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-            fastcgi_param PATH_INFO $fastcgi_path_info;
-            fastcgi_param HTTPS on;
-            #Avoid sending the security headers twice
-            fastcgi_param modHeadersAvailable true;
-            fastcgi_param front_controller_active true;
-            fastcgi_pass php;
-            fastcgi_intercept_errors on;
-            fastcgi_request_buffering off;
-        }
-
-        location ~ ^/(?:updater|ocs-provider)(?:$|/) {
-            try_files $uri/ =404;
-            index index.php;
-        }
-
-        location ~* \.(?:css|js)$ {
-            try_files $uri /index.php$uri$is_args$args;
-            add_header Cache-Control "public, max-age=7200";
-            add_header X-Content-Type-Options nosniff;
-            add_header X-Frame-Options "SAMEORIGIN";
-            add_header X-XSS-Protection "1; mode=block";
-            add_header X-Robots-Tag none;
-            add_header X-Download-Options noopen;
-            add_header X-Permitted-Cross-Domain-Policies none;
-            # Optional: Don't log access to assets
-            access_log off;
-        }
-
-        location ~* \.(?:svg|gif|png|html|ttf|woff|ico|jpg|jpeg)$ {
-            try_files $uri /index.php$uri$is_args$args;
-            access_log off;
-        }
-    }
-}