feature: remote wp-content/uploads content

docker-compose.yml

@@ -14,7 +14,7 @@ services:
     environment:
       WORDPRESS_SITEURL:    ${WPSTACK_PROTOCOL}://${WPSTACK_DOMAIN}/${WPSTACK_URLPATH:-}
       WORDPRESS_SITE_TYPE:  ${WPSTACK_MULTISITE:-regular}
-      WPSTACK_MEDIA_HOST: ${WPSTACK_MEDIA_HOST:-}
+      REMOTE_MEDIA_URL:     ${REMOTE_MEDIA_URL:-}
     labels:
       caddy: ${WPSTACK_DOMAIN}
       caddy.reverse_proxy: "reverse-proxy:80"
@@ -32,7 +32,7 @@ services:
     volumes:
       - ./webroot:/var/www/html
     environment:
-      WORDPRESS_DB_HOST:      db
+      WORDPRESS_DB_HOST:      ${WPSTACK_PROJECT_NAME:-wpstack}-db
       WORDPRESS_DB_USER:      ${DB_USER}
       WORDPRESS_DB_NAME:      ${DB_NAME}
       WORDPRESS_DB_PASSWORD:  ${DB_PASS}
@@ -54,15 +54,15 @@ services:
 
   db:
     container_name: ${WPSTACK_PROJECT_NAME:-wpstack}-db
-    image: ${DB_ENGINE:-mariadb}:${DB_VERSION:-latest}
+    image: mariadb
     volumes:
       - db_data:/var/lib/mysql
       - ../db:/docker-entrypoint-initdb.d
     environment:
-      MYSQL_RANDOM_ROOT_PASSWORD: true
+      MARIADB_RANDOM_ROOT_PASSWORD: true
-      MYSQL_USER: ${DB_USER}
+      MARIADB_USER: ${DB_USER}
-      MYSQL_PASSWORD: ${DB_PASS}
+      MARIADB_PASSWORD: ${DB_PASS}
-      MYSQL_DATABASE: ${DB_NAME}
+      MARIADB_DATABASE: ${DB_NAME}
     networks:
       - app-network
       - proxy-network

docker/nginx/templates/wordpress-regular-site.conf.template

@@ -28,6 +28,19 @@ server {
         access_log off;
     }
 
+    location ~ ^/wp-content/uploads/(.*)$ {
+        try_files $uri @remote_assets;
+    }
+
+    location @remote_assets {
+        set $remote_url "${REMOTE_MEDIA_URL}";
+        if ($remote_url = "") {
+            return 404;
+        }
+        add_header X-Redirect-From "nginx-local" always;
+        return 302 $remote_url$request_uri;
+    }
+
     location / {
         # This is cool because no php is touched for static content.
         # include the "?$args" part so non-default permalinks doesn't break when using query string
@@ -41,19 +54,6 @@ server {
         fastcgi_pass php;
     }
 
-    location ~* ^/wp-content/uploads/ {
-        set $media_host "${WPSTACK_MEDIA_HOST}";
-        try_files $uri @remote_media;
-    }
-
-    location @remote_media {
-        if ($media_host = "") {
-            return 404;
-        }
-
-        return 302 $media_host$request_uri;
-    }
-
     location ~* \.(js|css|png|jpg|jpeg|gif|ico)$ {
         expires max;
         log_not_found off;