Apedik/varnish production mode

bin/docker-compose

@@ -61,4 +61,3 @@ if [[ "$PWD" == *"docker-stack"* || "$PWD" == *"htdocs"* ]]; then
 else
     ${REAL_DOCKER_COMPOSE_CMD} ${BASH_ARGVS[*]};
 fi
-

docker/nginx/Dockerfile

@@ -8,9 +8,9 @@ RUN usermod -u $USERID nginx
 RUN groupmod -o -g $GROUPID nginx
 
 ADD nginx.conf /etc/nginx/nginx.conf
-ADD default.conf /etc/nginx/conf.d/default.conf
+ADD default-dev.conf /etc/nginx/conf.d/default.conf
 ADD m-hosts.conf /etc/nginx/conf.d/z-m-hosts.conf
-ADD m-servers.conf /etc/nginx/conf.d/z-m-servers.conf
+ADD m-servers-dev.conf /etc/nginx/conf.d/z-m-servers.conf
 ADD m-certs.conf /etc/nginx/conf.d/z-m-certs.conf
 
 # SSL

docker/nginx/Dockerfile-prod

@@ -0,0 +1,22 @@
+FROM nginx:1.25
+ARG USERID=1000
+ARG GROUPID=1000
+RUN groupmod -g 999 dialout
+
+# fix www-data user to avoid permissions issues
+RUN usermod -u $USERID nginx
+RUN groupmod -o -g $GROUPID nginx
+
+ADD nginx.conf /etc/nginx/nginx.conf
+ADD default-prod.conf /etc/nginx/conf.d/default.conf
+ADD m-hosts.conf /etc/nginx/conf.d/z-m-hosts.conf
+ADD m-servers-prod.conf /etc/nginx/conf.d/z-m-servers.conf
+ADD m-certs.conf /etc/nginx/conf.d/z-m-certs.conf
+
+# SSL
+ADD certs/* /etc/ssl/certs/
+ADD certs/* /etc/ssl/private/
+RUN whoami
+RUN chown -R -f nginx: /etc/ssl /var/cache/nginx /var/log/nginx /var/run /var/run/*
+
+EXPOSE 443

docker/nginx/default-dev.conf

@@ -0,0 +1,36 @@
+server {
+    listen       80;
+    server_name  _;
+
+    access_log  /var/log/nginx/default.access.log  main;
+
+    location / {
+        root   /var/www/htdocs/;
+        index  index.html index.htm index.php;
+    }
+
+    #error_page  404              /404.html;
+
+    # redirect server error pages to the static page /50x.html
+    #
+    error_page   500 502 503 504  /50x.html;
+    location = /50x.html {
+        root   /usr/share/nginx/html;
+    }
+
+    # pass the PHP scripts to FastCGI server
+    #
+    location ~ \.php$ {
+        set $php_host ${PHP_HOSTM2};
+        fastcgi_pass   ${php_host}:9000;
+        fastcgi_index  index.php;
+        fastcgi_param  SCRIPT_FILENAME  /scripts$fastcgi_script_name;
+        include        fastcgi_params;
+    }
+
+    # deny access to .htaccess files, if Apache's document root
+    location ~ /\.ht {
+        deny  all;
+    }
+}
+

docker/nginx/default-prod.conf

@@ -0,0 +1,36 @@
+server {
+    listen       8080;
+    server_name  _;
+
+    access_log  /var/log/nginx/default.access.log  main;
+
+    location / {
+        root   /var/www/htdocs/;
+        index  index.html index.htm index.php;
+    }
+
+    #error_page  404              /404.html;
+
+    # redirect server error pages to the static page /50x.html
+    #
+    error_page   500 502 503 504  /50x.html;
+    location = /50x.html {
+        root   /usr/share/nginx/html;
+    }
+
+    # pass the PHP scripts to FastCGI server
+    #
+    location ~ \.php$ {
+        set $php_host ${PHP_HOSTM2};
+        fastcgi_pass   ${php_host}:9000;
+        fastcgi_index  index.php;
+        fastcgi_param  SCRIPT_FILENAME  /scripts$fastcgi_script_name;
+        include        fastcgi_params;
+    }
+
+    # deny access to .htaccess files, if Apache's document root
+    location ~ /\.ht {
+        deny  all;
+    }
+}
+

docker/nginx/default.conf

@@ -1,5 +1,5 @@
 server {
-    listen       80;
+    listen       8080;
     server_name  _;
 
     access_log  /var/log/nginx/default.access.log  main;