Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
csandanov committed Feb 25, 2021
2 parents 639ed92 + fd478c7 commit 98e44ea
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 36 deletions.
62 changes: 31 additions & 31 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -32,56 +32,56 @@ FS_METHOD=direct

### --- MARIADB ----

MARIADB_TAG=10.5-3.11.0
#MARIADB_TAG=10.4-3.11.0
#MARIADB_TAG=10.3-3.11.0
#MARIADB_TAG=10.2-3.11.0
MARIADB_TAG=10.5-3.12.0
#MARIADB_TAG=10.4-3.12.0
#MARIADB_TAG=10.3-3.12.0
#MARIADB_TAG=10.2-3.12.0

### --- VANILLA WORDPRESS ----

WORDPRESS_TAG=5-4.31.0
WORDPRESS_TAG=5-4.32.0

### --- PHP ----

# Linux (uid 1000 gid 1000)

PHP_TAG=7.4-dev-4.21.1
#PHP_TAG=8.0-dev-4.21.1
#PHP_TAG=7.3-dev-4.21.1
PHP_TAG=7.4-dev-4.22.0
#PHP_TAG=8.0-dev-4.22.0
#PHP_TAG=7.3-dev-4.22.0

# macOS (uid 501 gid 20)

#PHP_TAG=7.4-dev-macos-4.21.1
#PHP_TAG=7.3-dev-macos-4.21.1
#PHP_TAG=7.2-dev-macos-4.21.1
#PHP_TAG=7.4-dev-macos-4.22.0
#PHP_TAG=7.3-dev-macos-4.22.0
#PHP_TAG=7.2-dev-macos-4.22.0

### --- NGINX ----

NGINX_TAG=1.19-5.12.0
#NGINX_TAG=1.18-5.12.0
NGINX_TAG=1.19-5.13.1
#NGINX_TAG=1.18-5.13.1

### --- REDIS ---

REDIS_TAG=5-3.5.1
#REDIS_TAG=6-3.5.1
REDIS_TAG=5-3.7.0
#REDIS_TAG=6-3.7.0

### --- NODE ---

NODE_TAG=14-dev-0.51.7
#NODE_TAG=12-dev-0.51.7
#NODE_TAG=10-dev-0.51.7
NODE_TAG=14-dev-0.52.1
#NODE_TAG=12-dev-0.52.1
#NODE_TAG=10-dev-0.52.1

### --- VARNISH ---

VARNISH_TAG=6.0-4.5.2
#VARNISH_TAG=4.1-4.5.2
VARNISH_TAG=6.0-4.6.1
#VARNISH_TAG=4.1-4.6.1

### --- SOLR ---

SOLR_TAG=8-4.9.1
#SOLR_TAG=7-4.9.1
#SOLR_TAG=6-4.9.1
#SOLR_TAG=5-4.9.1
SOLR_TAG=8-4.10.0
#SOLR_TAG=7-4.10.0
#SOLR_TAG=6-4.10.0
#SOLR_TAG=5-4.10.0

### --- ELASTICSEARCH ---

Expand All @@ -95,19 +95,19 @@ KIBANA_TAG=7-5.9.1

### --- POSTGRESQL ----

POSTGRES_TAG=13-1.21.0
#POSTGRES_TAG=12-1.21.0
#POSTGRES_TAG=11-1.21.0
#POSTGRES_TAG=10-1.21.0
#POSTGRES_TAG=9.6-1.21.0
POSTGRES_TAG=13-1.21.1
#POSTGRES_TAG=12-1.21.1
#POSTGRES_TAG=11-1.21.1
#POSTGRES_TAG=10-1.21.1
#POSTGRES_TAG=9.6-1.21.1

### OTHERS

ADMINER_TAG=4-3.15.0
APACHE_TAG=2.4-4.3.6
APACHE_TAG=2.4-4.3.9
ATHENAPDF_TAG=2.16.0
MEMCACHED_TAG=1-2.7.1
OPENSMTPD_TAG=6.0-1.8.2
OPENSMTPD_TAG=6.0-1.9.1
RSYSLOG_TAG=latest
WEBGRIND_TAG=1-1.21.1
XHPROF_TAG=2.7.1
10 changes: 5 additions & 5 deletions tests/.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.5-3.11.0
NGINX_TAG=1.19-5.12.0
REDIS_TAG=6-3.5.1
VARNISH_TAG=6.0-4.5.2
MARIADB_TAG=10.5-3.12.0
NGINX_TAG=1.19-5.13.1
REDIS_TAG=6-3.7.0
VARNISH_TAG=6.0-4.6.1

WORDPRESS_STABILITY_TAG=4.31.0
WORDPRESS_STABILITY_TAG=4.32.0

0 comments on commit 98e44ea

Please sign in to comment.