Add PHP 7.3, Varnish 6.0

wodby · Dec 18, 2018 · 5849dfb · 5849dfb
1 parent 6c4f3a9
commit 5849dfb
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 5 deletions.
diff --git a/.env b/.env
@@ -25,9 +25,16 @@ WORDPRESS_TAG=5-4.10.1
 
 ### --- PHP ----
 
+# Linux (uid 1000 gid 1000)
+
 PHP_TAG=7.2-dev-4.10.0
+#PHP_TAG=7.3-dev-4.10.0
 #PHP_TAG=7.1-dev-4.10.0
 #PHP_TAG=5.6-dev-4.10.0
+
+# macOS (uid 501 gid 20)
+
+#PHP_TAG=7.3-dev-macos-4.10.0
 #PHP_TAG=7.2-dev-macos-4.10.0
 #PHP_TAG=7.1-dev-macos-4.10.0
 #PHP_TAG=5.6-dev-macos-4.10.0
@@ -48,6 +55,11 @@ NODE_TAG=10-0.9.2
 #NODE_TAG=8-0.9.2
 #NODE_TAG=6-0.9.2
 
+### --- VARNISH ---
+
+VARNISH_TAG=4.1-4.0.0
+#VARNISH_TAG=6.0-4.0.0
+
 ### --- SOLR ---
 
 SOLR_TAG=7.4-3.0.6
@@ -92,6 +104,5 @@ ATHENAPDF_TAG=2.10.0
 MEMCACHED_TAG=1-2.2.1
 OPENSMTPD_TAG=6.0-1.4.0
 RSYSLOG_TAG=latest
-VARNISH_TAG=4.1-4.0.0
 WEBGRIND_TAG=1.5-1.7.0
 XHPROF_TAG=1.0.2
diff --git a/.travis.yml b/.travis.yml
@@ -5,6 +5,7 @@ services:
 
 env:
   matrix:
+    - WORDPRESS_VER=4 PHP_VER=7.3
     - WORDPRESS_VER=4 PHP_VER=7.2
     - WORDPRESS_VER=4 PHP_VER=7.1
     - WORDPRESS_VER=4 PHP_VER=5.6 GITHUB_RELEASE=1

diff --git a/README.md b/README.md
@@ -19,12 +19,12 @@ The WordPress stack consist of the following containers:
 | [Nginx]         | 1.15, 1.14         | `nginx`         | [wodby/nginx]                      | ✓       |
 | [Apache]        | 2.4                | `apache`        | [wodby/apache]                     |         |
 | [WordPress]     | 5                  | `php`           | [wodby/wordpress]                  | ✓       |
-| [PHP]           | 7.2, 7.1, 5.6      | `php`           | [wodby/wordpress-php]              |         |
+| [PHP]           | 7.3, 7.2, 7.1, 5.6 | `php`           | [wodby/wordpress-php]              |         |
 | [MariaDB]       | 10.3, 10.2, 10.1   | `mariadb`       | [wodby/mariadb]                    | ✓       |
 | [PostgreSQL]    | 11, 10, 9.x        | `postgres`      | [wodby/postgres]                   |         |
 | [Redis]         | 5, 4               | `redis`         | [wodby/redis]                      |         |
 | [Memcached]     | 1                  | `memcached`     | [wodby/memcached]                  |         |
-| [Varnish]       | 4.1                | `varnish`       | [wodby/varnish]                    |         |
+| [Varnish]       | 6.0, 4.1           | `varnish`       | [wodby/varnish]                    |         |
 | [Node.js]       | 10, 8, 6           | `node`          | [wodby/node]                       |         |
 | [Solr]          | 7.x, 6.6, 5.5      | `solr`          | [wodby/solr]                       |         |
 | [Elasticsearch] | 6.x, 5.6, 5.5, 5.4 | `elasticsearch` | [wodby/elasticsearch]              |         |

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -45,11 +45,11 @@ services:
     depends_on:
       - php
     environment:
-#      NGINX_PAGESPEED: "on"
       NGINX_STATIC_OPEN_FILE_CACHE: "off"
       NGINX_ERROR_LOG_LEVEL: debug
       NGINX_BACKEND_HOST: php
       NGINX_VHOST_PRESET: wordpress
+      #NGINX_SERVER_ROOT: /var/www/html/subdir
     volumes:
       - ./:/var/www/html
 # Options for macOS users (https://wodby.com/stacks/wordpress/docs/local/docker-for-mac/)

diff --git a/tests/.env b/tests/.env
@@ -9,6 +9,6 @@ DB_HOST=mariadb
 MARIADB_TAG=10.1-3.3.11
 NGINX_TAG=1.15-5.1.0
 REDIS_TAG=5-3.0.3
-VARNISH_TAG=4.1-3.0.2
+VARNISH_TAG=4.1-4.0.0
 
 WORDPRESS_STABILITY_TAG=4.10.1