Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
# Conflicts:
#	tests/10/.env
#	tests/7/.env
  • Loading branch information
csandanov committed May 8, 2024
2 parents a7df1d7 + 7505ea8 commit 38bcd8e
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
12 changes: 6 additions & 6 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ MARIADB_TAG=10.11-3.28.2

### --- VANILLA DRUPAL ----

DRUPAL_TAG=10-4.70.6
#DRUPAL_TAG=7-4.70.6
DRUPAL_TAG=10-4.71.0
#DRUPAL_TAG=7-4.71.0

### --- PHP ----

Expand Down Expand Up @@ -72,7 +72,7 @@ SOLR_CONFIG_SET="search_api_solr_4.1.6"

### --- ELASTICSEARCH ---

ELASTICSEARCH_TAG=7-5.19.6
ELASTICSEARCH_TAG=7-5.19.7

### --- KIBANA ---

Expand All @@ -84,8 +84,8 @@ VALKEY_TAG=7-0.1.0

### --- NODE ---

NODE_TAG=20-dev-1.32.2
#NODE_TAG=18-dev-1.32.2
NODE_TAG=20-dev-1.33.0
#NODE_TAG=18-dev-1.33.0

### --- VARNISH ---

Expand All @@ -105,7 +105,7 @@ ADMINER_TAG=4-3.24.4
APACHE_TAG=2.4-4.13.2
ATHENAPDF_TAG=2.16.0
DRUPAL_NODE_TAG=1.0-2.0.0
MEMCACHED_TAG=1-2.16.5
MEMCACHED_TAG=1-2.16.6
OPENSMTPD_TAG=6-1.20.1
RSYSLOG_TAG=latest
SELENIUM_CHROME_TAG=3.141
Expand Down
2 changes: 1 addition & 1 deletion tests/10/.env
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ SOLR_CONFIG_SET="search_api_solr_4.1.6"

NGINX_VHOST_PRESET=drupal10
NGINX_TAG=1.26-5.35.0
DRUPAL_STABILITY_TAG=4.70.6
DRUPAL_STABILITY_TAG=4.71.0
ZOOKEEPER_TAG=3.8
2 changes: 1 addition & 1 deletion tests/7/.env
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ SOLR_CONFIG_SET="search_api_solr_7.x-1.14"

NGINX_VHOST_PRESET=drupal7
NGINX_TAG=1.26-5.35.0
DRUPAL_STABILITY_TAG=4.70.6
DRUPAL_STABILITY_TAG=4.71.0

0 comments on commit 38bcd8e

Please sign in to comment.