Merge branch 'release/3.6.6'

Release 3.6.6

Author: singularo

RoboFileBase.php

@@ -595,7 +595,7 @@ public function devImportDb($sql_file) {
     $this->_exec("$this->drush_cmd -y sql-drop");
     $this->_exec("$this->drush_cmd sqlq --file=$sql_file");
     $this->_exec("$this->drush_cmd cr");
-    $this->_exec("$this->drush_cmd upwd admin --password=password");
+    $this->_exec("$this->drush_cmd upwd admin password");
     $this->_exec("$this->drush_cmd updb --entity-updates -y");
     $this->say('Duration: ' . date_diff(new DateTime(), $start)->format('%im %Ss'));
     $this->say('Database imported, admin user password is : password');

docker-compose.linux.yml

@@ -12,9 +12,6 @@ services:
     ports:
       - "80:8080"
     environment:
-      DATABASE_HOST: db
-      DATABASE_USER: user
-      DATABASE_PASSWORD: password
       HASH_SALT: random-hash
       MEMCACHE_ENABLED: 0
       MEMCACHE_HOST: memcached
@@ -53,8 +50,7 @@ services:
       MYSQL_USER: user
       MYSQL_PASSWORD: password
       MYSQL_ROOT_PASSWORD: super-secret-password
-    networks:
-      - default
+    network_mode: service:web
 
   mail:
     image: mailhog/mailhog
@@ -93,7 +89,7 @@ services:
       - default
 
   selenium:
-    image: selenium/standalone-chrome:3.141.59-oxygen
+    image: selenium/standalone-chrome:latest
     volumes:
       - /dev/shm:/dev/shm
     network_mode: service:web

dsh

@@ -3,6 +3,12 @@
 # `set +e` is used to continue on errors throughout this script.
 set -euo pipefail
 
+# Ensure script is NOT running inside a container - must be run from host.
+if [ -f /.dockerenv ]; then
+  echo "Inception error - you can't run $0 within a docker container."
+  exit
+fi
+
 # Used as the prefix for docker networking, container naming and nginx hostname.
 export PROJECT=$(basename ${PWD})
 # docker-compose stopped stripping chars from project name in 1.21.0.
@@ -43,12 +49,6 @@ error() {
   printf "\e[31;01m$1\e[39;49;00m\n"
 }
 
-# Ensure script is NOT running inside a container - must be run from host.
-if [ -f /.dockerenv ]; then
-  error "Inception error - you can't run $0 within a docker container."
-  exit
-fi
-
 # Command: ./dsh start
 # Configures environment then brings up project using docker-compose.yml file.
 dsh_start() {