Merge pull request #443 from wallabag/release-2613

Prepare 2.6.13 release

Dockerfile

@@ -13,7 +13,7 @@ FROM alpine:3.18
 
 COPY --from=builder /go/bin/envsubst /usr/bin/envsubst
 
-ARG WALLABAG_VERSION=2.6.12
+ARG WALLABAG_VERSION=2.6.13
 
 RUN set -ex \
  && apk add --no-cache \

README.md

@@ -42,7 +42,6 @@ Default login is `wallabag:wallabag`.
 - `-e POPULATE_DATABASE=...`(defaults to "True". Does the DB has to be populated or is it an existing one)
 - `-e SYMFONY__ENV__SERVER_NAME=...` (defaults to "Your wallabag instance". Specifies a user-friendly name for the 2FA issuer)
 - `-e PHP_MEMORY_LIMIT=...` (allows you to change the PHP `memory_limit` value. defaults to 128M, and should be a number and unit, eg. 512K, 128M, 2G, or a number of bytes)
-- `-e FASTCGI_READ_TIMEOUT=...` (allows you to change the timeout how nginx handle cgi backend connection to PHP. default is 300s for 5 minutes)
 
 ## SQLite
 

root/entrypoint.sh

@@ -29,7 +29,6 @@ provisioner() {
     # Replace environment variables
     envsubst < /etc/wallabag/parameters.template.yml > app/config/parameters.yml
     envsubst < /etc/wallabag/php-wallabag.template.ini > /etc/php81/conf.d/50_wallabag.ini
-    envsubst '${FASTCGI_READ_TIMEOUT}' < /etc/wallabag/nginx.template.conf | sed 's/\$\${/\${/g' > /etc/nginx/nginx.conf 
 
     # Wait for external database
     if [ "$SYMFONY__ENV__DATABASE_DRIVER" = "pdo_mysql" ] || [ "$SYMFONY__ENV__DATABASE_DRIVER" = "pdo_pgsql" ] ; then

root/etc/wallabag/nginx.template.conf

@@ -1,73 +0,0 @@
-user  nginx;
-worker_processes  1;
-pid        /var/run/nginx.pid;
-
-events {
-    worker_connections  2048;
-    multi_accept on;
-    use epoll;
-}
-
-http {
-
-    server_tokens off;
-    sendfile on;
-    tcp_nopush on;
-    tcp_nodelay on;
-    keepalive_timeout 15;
-    types_hash_max_size 2048;
-    include /etc/nginx/mime.types;
-    default_type application/octet-stream;
-    access_log off;
-    error_log off;
-    gzip on;
-    gzip_disable "msie6";
-    open_file_cache max=100;
-    client_max_body_size 100M;
-
-    map $$http_x_forwarded_proto $$fe_https {
-        default $$https;
-        https on;
-    }
-
-    upstream php-upstream {
-        server 127.0.0.1:9000;
-    }
-
-    server {
-        listen [::]:80 ipv6only=off;
-        server_name _;
-        root /var/www/wallabag/web;
-
-        location / {
-            # try to serve file directly, fallback to app.php
-            try_files $$uri /app.php$$is_args$$args;
-        }
-
-        location ~ ^/app\.php(/|$$) {
-            fastcgi_pass php-upstream;
-            fastcgi_split_path_info ^(.+\.php)(/.*)$$;
-            include fastcgi_params;
-            # When you are using symlinks to link the document root to the
-            # current version of your application, you should pass the real
-            # application path instead of the path to the symlink to PHP
-            # FPM.
-            # Otherwise, PHP's OPcache may not properly detect changes to
-            # your PHP files (see https://github.com/zendtech/ZendOptimizerPlus/issues/126
-            # for more information).
-            fastcgi_param  SCRIPT_FILENAME  $$realpath_root$$fastcgi_script_name;
-            fastcgi_param DOCUMENT_ROOT $$realpath_root;
-            fastcgi_read_timeout ${FASTCGI_READ_TIMEOUT:-300s};
-            # Prevents URIs that include the front controller. This will 404:
-            # http://domain.tld/app.php/some-path
-            # Remove the internal directive to allow URIs like this
-            internal;
-        }
-
-        access_log /var/log/nginx/access.log;
-        error_log /var/log/nginx/error.log;
-    }
-
-}
-
-daemon off;