diff --git a/.env b/.env index 3b4dcc3e8..8c8f7bb4e 100644 --- a/.env +++ b/.env @@ -27,33 +27,35 @@ DB_HOST=mariadb ### --- MARIADB ---- -MARIADB_TAG=10.2-3.1.3 -#MARIADB_TAG=10.1-3.1.3 +MARIADB_TAG=10.1-3.2.0 +#MARIADB_TAG=10.2-3.2.0 +#MARIADB_TAG=10.3-3.2.0 ### --- VANILLA WORDPRESS ---- ### [WORDPRESS_VERSION]-[PHP_VERSION]-[STABILITY_TAG] -WORDPRESS_TAG=4-7.2-4.4.2 -#WORDPRESS_TAG=4-7.1-4.4.2 -#WORDPRESS_TAG=4-7.0-4.4.2 -#WORDPRESS_TAG=4-5.6-4.4.2 +WORDPRESS_TAG=4-7.2-4.4.4 +#WORDPRESS_TAG=4-7.1-4.4.4 +#WORDPRESS_TAG=4-7.0-4.4.4 +#WORDPRESS_TAG=4-5.6-4.4.4 ### --- PHP ---- -PHP_TAG=7.2-dev-4.4.2 -#PHP_TAG=7.1-dev-4.4.2 -#PHP_TAG=7.0-dev-4.4.2 -#PHP_TAG=5.6-dev-4.4.2 -#PHP_TAG=7.2-dev-macos-4.4.2 -#PHP_TAG=7.1-dev-macos-4.4.2 -#PHP_TAG=7.0-dev-macos-4.4.2 -#PHP_TAG=5.6-dev-macos-4.4.2 +PHP_TAG=7.2-dev-4.4.4 +#PHP_TAG=7.1-dev-4.4.4 +#PHP_TAG=7.0-dev-4.4.4 +#PHP_TAG=5.6-dev-4.4.4 +#PHP_TAG=7.2-dev-macos-4.4.4 +#PHP_TAG=7.1-dev-macos-4.4.4 +#PHP_TAG=7.0-dev-macos-4.4.4 +#PHP_TAG=5.6-dev-macos-4.4.4 ### --- NGINX ---- ### [WORDPRESS_VERSION]-[NGINX_VERSION]-[STABILITY_TAG] -NGINX_TAG=4-1.13-4.1.0 -#NGINX_TAG=4-1.14-4.1.0 +NGINX_TAG=4-1.15-4.2.0 +#NGINX_TAG=4-1.14-4.2.0 +#NGINX_TAG=4-1.13-4.2.0 ### --- REDIS --- @@ -108,5 +110,5 @@ POSTGRES_TAG=10.1-1.3.0 ADMINER_TAG=4.3-1.1.0 APACHE_TAG=2.4-3.0.5 ATHENAPDF_TAG=2.10.0 -VARNISH_TAG=4.1-2.4.1 -WEBGRIND_TAG=1.5-1.3.0 +VARNISH_TAG=4.1-2.5.0 +WEBGRIND_TAG=1.5-1.3.1 diff --git a/README.md b/README.md index 76f352342..acf0b770f 100644 --- a/README.md +++ b/README.md @@ -36,11 +36,11 @@ The WordPress stack consist of the following containers: | Container | Versions | Service name | Image | Enabled by default | | ------------- | ------------------ | ------------ | ---------------------------------- | ------------------ | -| Nginx | 1.14, 1.13 | `nginx` | [wodby/wordpress-nginx] | ✓ | +| Nginx | 1.15, 1.14, 1.13 | `nginx` | [wodby/wordpress-nginx] | ✓ | | Apache | 2.4 | `apache` | [wodby/php-apache] | | | WordPress | 4 | `php` | [wodby/wordpress] | ✓ | | PHP | 7.x, 5.6 | `php` | [wodby/wordpress-php] | | -| MariaDB | 10.2, 10.1 | `mariadb` | [wodby/mariadb] | ✓ | +| MariaDB | 10.3, 10.2, 10.1 | `mariadb` | [wodby/mariadb] | ✓ | | PostgreSQL | 10.1, 9.6 | `postgres` | [wodby/postgres] | | | Redis | 4.0, 3.2 | `redis` | [wodby/redis] | | | Varnish | 4.1 | `varnish` | [wodby/wordpress-varnish] | | diff --git a/docker-compose.yml b/docker-compose.yml index 6c861a823..71be03697 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -45,6 +45,7 @@ services: depends_on: - php environment: +# NGINX_PAGESPEED: "on" NGINX_STATIC_CONTENT_OPEN_FILE_CACHE: "off" NGINX_ERROR_LOG_LEVEL: debug NGINX_BACKEND_HOST: php diff --git a/test/4/.env b/test/4/.env index 7914c4979..e91b87f0c 100644 --- a/test/4/.env +++ b/test/4/.env @@ -6,9 +6,9 @@ DB_PASSWORD=wordpress DB_ROOT_PASSWORD=password DB_HOST=mariadb -MARIADB_TAG=10.2-3.1.3 -NGINX_TAG=4-1.14-4.1.0 +MARIADB_TAG=10.1-3.2.1 +NGINX_TAG=4-1.15-4.2.0 REDIS_TAG=4.0-2.1.5 -VARNISH_TAG=4.1-2.4.1 +VARNISH_TAG=4.1-2.5.0 -WORDPRESS_STABILITY_TAG=4.4.2 \ No newline at end of file +WORDPRESS_STABILITY_TAG=4.4.4 \ No newline at end of file