Update drupal and drupal/php images to 4.2.2

wodby · Mar 8, 2018 · 72023e4 · 72023e4
1 parent 3ca20a5
commit 72023e4
Show file tree

Hide file tree

Showing 50 changed files with 25 additions and 888 deletions.
diff --git a/.env b/.env
@@ -34,24 +34,24 @@ MARIADB_TAG=10.2-3.1.2
 ### --- VANILLA DRUPAL ----
 ### [DRUPAL_VERSION]-[PHP_VERSION]-[STABILITY_TAG]
 
-DRUPAL_TAG=8-7.1-4.2.0
-#DRUPAL_TAG=8-7.0-4.2.0
-#DRUPAL_TAG=7-7.1-4.2.0
-#DRUPAL_TAG=7-7.0-4.2.0
-#DRUPAL_TAG=7-5.6-4.2.0
-#DRUPAL_TAG=6-5.6-4.2.0
-#DRUPAL_TAG=6-5.3-4.2.0
+DRUPAL_TAG=8-7.1-4.2.2
+#DRUPAL_TAG=8-7.0-4.2.2
+#DRUPAL_TAG=7-7.1-4.2.2
+#DRUPAL_TAG=7-7.0-4.2.2
+#DRUPAL_TAG=7-5.6-4.2.2
+#DRUPAL_TAG=6-5.6-4.2.2
+#DRUPAL_TAG=6-5.3-4.2.2
 
 ### --- PHP ----
 
-PHP_TAG=7.1-dev-4.2.1
-#PHP_TAG=7.0-dev-4.2.1
-#PHP_TAG=5.6-dev-4.2.1
-#PHP_TAG=5.3-dev-4.2.1
-#PHP_TAG=7.1-dev-macos-4.2.1
-#PHP_TAG=7.0-dev-macos-4.2.1
-#PHP_TAG=5.6-dev-macos-4.2.1
-#PHP_TAG=5.3-dev-macos-4.2.1
+PHP_TAG=7.1-dev-4.2.2
+#PHP_TAG=7.0-dev-4.2.2
+#PHP_TAG=5.6-dev-4.2.2
+#PHP_TAG=5.3-dev-4.2.2
+#PHP_TAG=7.1-dev-macos-4.2.2
+#PHP_TAG=7.0-dev-macos-4.2.2
+#PHP_TAG=5.6-dev-macos-4.2.2
+#PHP_TAG=5.3-dev-macos-4.2.2
 
 ### --- NGINX ----
 ### [DRUPAL_VERSION]-[NGINX_VERSION]-[STABILITY_TAG]

diff --git a/Makefile b/Makefile
@@ -6,4 +6,4 @@ DRUPAL_VER ?= 8
 PHP_VER ?= 7.1
 
 test:
-	cd ./test/$(DRUPAL_VER)/$(PHP_VER) && ./run
+	cd ./test/$(DRUPAL_VER) && PHP_VER=$(PHP_VER) ./run
diff --git a/test/6/5.3/.env → test/6/.env b/test/6/5.3/.env → test/6/.env
@@ -7,6 +7,6 @@ DB_DRIVER=mysql
 
 MARIADB_TAG=10.2-3.1.2
 MEMCACHED_TAG=1.4-2.0.0
-
 NGINX_TAG=6-1.13-4.0.2
-DRUPAL_TAG=6-5.3-4.2.0
+
+DRUPAL_STABILITY_TAG=4.2.2
diff --git a/test/6/5.6/.env b/test/6/5.6/.env
diff --git a/test/6/5.6/docker-compose.yml b/test/6/5.6/docker-compose.yml
diff --git a/test/6/5.6/run b/test/6/5.6/run
diff --git a/test/6/5.6/test.settings.php b/test/6/5.6/test.settings.php
diff --git a/test/6/5.6/tests b/test/6/5.6/tests
diff --git a/test/6/5.3/docker-compose.yml → test/6/docker-compose.yml b/test/6/5.3/docker-compose.yml → test/6/docker-compose.yml
@@ -10,7 +10,7 @@ services:
       MYSQL_PASSWORD: $DB_PASSWORD
 
   php:
-    image: wodby/drupal:$DRUPAL_TAG
+    image: wodby/drupal:6-$PHP_VER-$DRUPAL_STABILITY_TAG
     environment:
       # To skip auto init.
       WODBY_APP_NAME: drupal

diff --git a/test/6/5.3/run → test/6/run b/test/6/5.3/run → test/6/run
diff --git a/test/6/5.3/test.settings.php → test/6/test.settings.php b/test/6/5.3/test.settings.php → test/6/test.settings.php
diff --git a/test/6/5.3/tests → test/6/tests b/test/6/5.3/tests → test/6/tests
diff --git a/test/7/7.1/.env → test/7/.env b/test/7/7.1/.env → test/7/.env
@@ -8,7 +8,7 @@ DB_DRIVER=mysql
 MARIADB_TAG=10.2-3.1.2
 REDIS_TAG=4.0-2.1.5
 VARNISH_TAG=4.1-2.3.0
-
 NGINX_TAG=7-1.13-4.0.2
 SOLR_TAG=7-5.4-2.3.0
-DRUPAL_TAG=7-7.1-4.2.0
+
+DRUPAL_STABILITY_TAG=4.2.2
diff --git a/test/7/5.6/.env b/test/7/5.6/.env
diff --git a/test/7/7.0/.env b/test/7/7.0/.env
diff --git a/test/7/7.0/docker-compose.yml b/test/7/7.0/docker-compose.yml
diff --git a/test/7/7.0/feature_search_api_solr/feature_search_api_solr.features.inc b/test/7/7.0/feature_search_api_solr/feature_search_api_solr.features.inc
diff --git a/test/7/7.0/feature_search_api_solr/feature_search_api_solr.info b/test/7/7.0/feature_search_api_solr/feature_search_api_solr.info
diff --git a/test/7/7.0/feature_search_api_solr/feature_search_api_solr.module b/test/7/7.0/feature_search_api_solr/feature_search_api_solr.module
diff --git a/test/7/7.0/test.settings.php b/test/7/7.0/test.settings.php