Fix d8 web update.php, fixes #830 (#838)

* fixes nginx conf for access to d8 update.php * Bump version to pull in manually-built change
ddev · May 15, 2018 · 3083157 · 3083157
1 parent 02cf378
commit 3083157
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/containers/nginx-php-fpm-local/files/etc/nginx/nginx-site-drupal8.conf b/containers/nginx-php-fpm-local/files/etc/nginx/nginx-site-drupal8.conf
@@ -43,8 +43,7 @@ server {
     }
 
     # pass the PHP scripts to FastCGI server listening on socket
-    location ~ \.php$ {
-        try_files $uri =404;
+    location ~ '\.php$|^/update.php' {
         fastcgi_split_path_info ^(.+\.php)(/.+)$;
         fastcgi_pass unix:/run/php-fpm.sock;
         fastcgi_buffers 16 16k;

diff --git a/pkg/version/version.go b/pkg/version/version.go
@@ -17,16 +17,16 @@ var DockerVersionConstraint = ">= 17.05.0-ce-alpha1"
 var DockerComposeVersionConstraint = ">= 1.10.0-alpha1"
 
 // WebImg defines the default web image used for applications.
-var WebImg = "drud/nginx-php-fpm-local" // Note that this is overridden by make
+var WebImg = "drud/nginx-php-fpm-local"
 
 // WebTag defines the default web image tag for drud dev
-var WebTag = "v1.3.0" // Note that this is overridden by make
+var WebTag = "v0.18.0-5-g78f25609" // Note that this can be overridden by make
 
 // DBImg defines the default db image used for applications.
-var DBImg = "drud/mariadb-local" // Note that this is overridden by make
+var DBImg = "drud/mariadb-local"
 
 // DBTag defines the default db image tag for drud dev
-var DBTag = "v0.9.0" // Note that this is overridden by make
+var DBTag = "v0.9.0" // Note that this may be overridden by make
 
 // DBAImg defines the default phpmyadmin image tag used for applications.
 var DBAImg = "drud/phpmyadmin"