WIP:fpm

diff --git a/docker-compose.yml b/docker-compose.yml
index 63e719e9bfa40e1aad6009ff1b981b09430a6eea..f0c932ddad07d6a647e38ec6ff5e40215c42eabe 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,17 +1,20 @@
 services:
   nginx:
     image: nginx:mainline-alpine
+    depends_on:
+      - wordpress
     ports:
       - 8888:80
     volumes:
       - ./nginx.conf:/etc/nginx/conf.d/default.conf:ro
       - ./:/usr/share/nginx/html:ro
   wordpress:
-    image: wordpress:6.3.2-php8.2-apache
+    image: wordpress:6.3.2-php8.2-fpm
     read_only: true
     depends_on:
       - mariadb
     environment:
+      SCRIPT_FILENAME: /usr/src/wordpress
       WORDPRESS_DB_HOST: mariadb:3306
       WORDPRESS_DB_USER: wordpress
       WORDPRESS_DB_PASSWORD: I0vAUXKC
@@ -19,18 +22,17 @@ services:
       WORDPRESS_DB_CHARSET: latin1
       WORDPRESS_DB_COLLATE: latin1_general_ci
       WORDPRESS_SECRET_KEY: vTelcON5v26YTrdtKfMvyYFuetRwaWyK2K4tfalgpr
+    tmpfs:
+      - /tmp
+      - /run
     volumes:
       - ./wordpress/wp-config.php:/usr/src/wordpress/wp-config.php:ro
-      - ./wordpress/tmp:/tmp:rw
-      - ./wordpress/run:/run:rw
       - ./wordpress/wp-content/themes/juplo-theme:/usr/src/wordpress/wp-content/themes/juplo-theme:ro
       - ./wordpress/wp-content/plugins/classic-editor:/usr/src/wordpress/wp-content/plugins/classic-editor:ro
       - ./wordpress/wp-content/plugins/google-analytics-for-wordpress:/usr/src/wordpress/wp-content/plugins/google-analytics-for-wordpress:ro
       - ./wordpress/wp-content/plugins/google-sitemap-generator:/usr/src/wordpress/wp-content/plugins/google-sitemap-generator:ro
       - ./wordpress/wp-content/plugins/open-graph-protocol-framework:/usr/src/wordpress/wp-content/plugins/open-graph-protocol-framework:ro
       - ./wordpress/wp-content/plugins/user-role-editor:/usr/src/wordpress/wp-content/plugins/user-role-editor:ro
-    ports:
-      - 80:80
   mariadb:
     image: mariadb:10.11.15-jammy
     environment:

diff --git a/nginx.conf b/nginx.conf
index b5a1b87c3e30a4f11886dd8a878d3af70dafaf7a..8175e3c36157699fee373870bf8cbd97af0ecf20 100644 (file)
--- a/nginx.conf
+++ b/nginx.conf
@@ -3,13 +3,8 @@ server {
     listen [::]:80;
     server_name localhost;
 
-    index index.html index.htm;
-
     root /usr/share/nginx/html/juplo.de/dist;
 
-    location / {
-        expires 0;
-    }
     location /projects/ {
         alias /usr/share/nginx/html/projects/;
         expires 0;
@@ -54,5 +49,28 @@ server {
         alias /usr/share/nginx/html/projects/hibernate-maven-plugin/1.0/;
         expires 0;
     }
+
+    index index.php;
+
+    location / {
+        try_files $uri $uri/ /index.php?$args;
+    }
+
+    rewrite /wp-admin$ $scheme://$host$uri/ permanent;
+
+    location ~ [^/]\.php(/|$) {
+        fastcgi_split_path_info ^(.+?\.php)(/.*)$;
+        if (!-f $document_root$fastcgi_script_name) {
+            return 404;
+        }
+
+        include fastcgi_params;
+        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+        fastcgi_param PATH_INFO       $fastcgi_path_info;
+        fastcgi_param PATH_TRANSLATED $document_root$fastcgi_path_info;
+
+        fastcgi_pass     wordpress:9000;
+        fastcgi_index    index.php; 
+    }
 }