Skip to content

Commit

Permalink
Update images
Browse files Browse the repository at this point in the history
  • Loading branch information
csandanov committed Jun 20, 2018
1 parent 85525e3 commit cd981c9
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 24 deletions.
38 changes: 20 additions & 18 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -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 ---

Expand Down Expand Up @@ -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
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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] | |
Expand Down
1 change: 1 addition & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions test/4/.env
Original file line number Diff line number Diff line change
Expand Up @@ -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
WORDPRESS_STABILITY_TAG=4.4.4

0 comments on commit cd981c9

Please sign in to comment.