Merge pull request #131 from Metadrop/udpate-and-fixes

Update packages and several fixes

.env.example

@@ -9,6 +9,8 @@ PROJECT_BASE_URL=example.docker.localhost
 DOCKER_PROJECT_ROOT=/var/www/html
 NPM_RUN_COMMAND=dev
 DEFAULT_DRUSH_ALIAS=example.stg
+THEME_PATH=/var/www/html/web/themes/custom/example_radix
+
 
 DB_NAME=drupal
 DB_USER=drupal
@@ -28,37 +30,47 @@ DOCKER_COMPOSE_CMD=docker compose
 
 ### --- MARIADB ----
 
-MARIADB_TAG=10.5-3.10.0
-#MARIADB_TAG=10.4-3.10.0
-#MARIADB_TAG=10.3-3.10.0
-#MARIADB_TAG=10.2-3.10.0
+MARIADB_TAG=10.11-3.28.0
+#MARIADB_TAG=11.2-3.28.0
+#MARIADB_TAG=11.1-3.28.0
+#MARIADB_TAG=11.0-3.28.0
+#MARIADB_TAG=10.6-3.28.0
+#MARIADB_TAG=10.5-3.28.0
+#MARIADB_TAG=10.4-3.28.0
 
 ### --- PHP ----
 
 # Linux (uid 1000 gid 1000)
 
-#PHP_TAG=8.2-dev-4.44.0
-PHP_TAG=8.1-dev-4.47.5
-#PHP_TAG=8.0-dev-4.44.0
+#PHP_TAG=8.3-dev-4.53.0
+PHP_TAG=8.2-dev-4.53.0
+#PHP_TAG=8.1-dev-4.53.0
+
 
 # macOS (uid 501 gid 20)
 
-#PHP_TAG=8.2-dev-macos-4.44.0
-#PHP_TAG=8.1-dev-macos-4.44.0
-#PHP_TAG=8.0-dev-macos-4.44.0
+#PHP_TAG=8.3-dev-macos-4.53.0
+#PHP_TAG=8.2-dev-macos-4.53.0
+#PHP_TAG=8.1-dev-macos-4.53.0
 
 ### --- NGINX ----
 
-NGINX_TAG=1.19-5.11.0
-#NGINX_TAG=1.18-5.11.0
+NGINX_TAG=1.25-5.34.0
+#NGINX_TAG=1.24-5.34.0
+#NGINX_TAG=1.25-5.34.0
 
-NGINX_VHOST_PRESET=drupal9
+NGINX_VHOST_PRESET=drupal10
+#NGINX_VHOST_PRESET=drupal9
 #NGINX_VHOST_PRESET=drupal8
 #NGINX_VHOST_PRESET=drupal7
-#NGINX_VHOST_PRESET=drupal6
 
 ### --- SOLR ---
 
+SOLR_TAG=8-4.18.2
+#SOLR_TAG=7-4.18.2
+#SOLR_TAG=6-4.18.2
+#SOLR_TAG=5-4.18.2
+
 SOLR_CONFIG_SET="search_api_solr_4.1.6"
 #SOLR_CONFIG_SET="search_api_solr_4.0.1"
 #SOLR_CONFIG_SET="search_api_solr_8.x-3.9"
@@ -67,25 +79,18 @@ SOLR_CONFIG_SET="search_api_solr_4.1.6"
 #SOLR_CONFIG_SET="search_api_solr_8.x-1.2"
 #SOLR_CONFIG_SET="search_api_solr_7.x-1.14"
 
-SOLR_TAG=8-4.8.0
-#SOLR_TAG=7-4.8.0
-#SOLR_TAG=6-4.8.0
-#SOLR_TAG=5-4.8.0
-
 ### --- ELASTICSEARCH ---
 
-ELASTICSEARCH_TAG=7-5.8.2
-#ELASTICSEARCH_TAG=6-5.8.2
+ELASTICSEARCH_TAG=7-5.19.2
 
 ### --- KIBANA ---
 
-KIBANA_TAG=7-5.8.2
-#KIBANA_TAG=6-5.8.2
+KIBANA_TAG=7-5.19.2
 
 ### --- REDIS ---
 
-REDIS_TAG=6-3.4.9
-#REDIS_TAG=5-3.4.9
+REDIS_TAG=7-4.4.1
+#REDIS_TAG=6-4.4.1
 
 ### --- NODE ---
 
@@ -95,44 +100,42 @@ NODE_TAG=16-dev-1.18.1
 
 ### --- VARNISH ---
 
-VARNISH_TAG=6.0-4.5.0
-#VARNISH_TAG=4.1-4.5.0
+VARNISH_TAG=6.0-4.16.0
 
 ### --- POSTGRESQL ----
 
-POSTGRES_TAG=13-1.16.0
-#POSTGRES_TAG=12-1.16.0
-#POSTGRES_TAG=11-1.16.0
-#POSTGRES_TAG=10-1.16.0
-#POSTGRES_TAG=9.6-1.16.0
-#POSTGRES_TAG=9.5-1.16.0
-#POSTGRES_TAG=9.4-1.16.0
+POSTGRES_TAG=16-1.33.0
+#POSTGRES_TAG=15-1.33.0
+#POSTGRES_TAG=14-1.33.0
+#POSTGRES_TAG=13-1.33.0
+#POSTGRES_TAG=12-1.33.0
+
 
 ### --- TRAEFIK ---
 TRAEFIK_TAG=v2.0
 
 ### --- HUB ---
-HUB_TAG=3.141.59-neon
+HUB_TAG=4.8.0
 
 ### --- CHROME ---
-CHROME_TAG=3.141.59-neon
+CHROME_TAG=4.8.0
 
 ### --- BACKSTOPJS ----
 BACKSTOPJS_TAG=6.1.4
 
 ### OTHERS
 
-ADMINER_TAG=4-3.14.0
-APACHE_TAG=2.4-4.3.5
+ADMINER_TAG=4-3.24.4
+APACHE_TAG=2.4-4.13.0
 ATHENAPDF_TAG=2.16.0
 DRUPAL_NODE_TAG=1.0-2.0.0
-MEMCACHED_TAG=1-2.6.6
-OPENSMTPD_TAG=6.0-1.8.0
+MEMCACHED_TAG=1-2.16.1
+OPENSMTPD_TAG=6-1.20.0
 RSYSLOG_TAG=latest
-PHANTOMJS_VERSION=2
 SELENIUM_CHROME_TAG=3.141
-WEBGRIND_TAG=1.8-1.20.0
-XHPROF_TAG=2.7.0
+WEBGRIND_TAG=1-1.30.1
+XHPROF_TAG=3.7.6
+ZOOKEEPER_TAG=3.8
 MKDOCS_TAG=1.1.0
 
 SHM_SIZE=256M

.gitignore

@@ -52,10 +52,8 @@ node_modules/
 .sass-cache
 .cache
 
-# Test related Reports.
-/reports/behat/errors/*
-/reports/behat/junit/*
-/reports/codereview/*
+# Test related reports.
+/reports/*
 
 # BackstopJS
 /tests/*/backstopjs/backstop_data/html_report

behat.yml

@@ -59,14 +59,14 @@ default:
 
   extensions:
     Drupal\MinkExtension:
+      ajax_timeout: 5
       browserkit_http: ~
       browser_name: "chrome"
       base_url: "http://apache"
       show_cmd: lynx %s
       files_path: "%paths.base%/tests/functional/behat/files"
       javascript_session: selenium2
       selenium2:
-        # wd_host: http://127.0.0.1:4444/wd/hub
         wd_host: http://hub:4444/wd/hub
         capabilities:
           browser: "chrome"

composer.json

@@ -16,34 +16,30 @@
         }
     ],
     "require": {
-        "composer/installers": "^1.7",
+        "composer/installers": "^2.2",
         "cweagans/composer-patches": "^1.7",
-        "drupal-composer/drupal-security-advisories": "8.x-dev",
-        "drupal/admin_toolbar": "^3.3",
+        "drupal-composer/drupal-security-advisories": "9.x-dev",
+        "drupal/admin_toolbar": "^3.4",
         "drupal/components": "^3.0@beta",
-        "drupal/config_split": "^2.0@RC",
+        "drupal/config_split": "^2.0",
         "drupal/core-composer-scaffold": "^10.0",
         "drupal/core-recommended": "^10.0",
         "drupal/environment_indicator": "^4.0",
-        "drupal/eu_cookie_compliance": "^1.13",
         "drupal/honeypot": "^2.0",
-        "drupal/metatag": "^1.14",
-        "drupal/paragraphs": "^1.12",
+        "drupal/metatag": "^2.0",
         "drupal/pathauto": "^1.8",
-        "drupal/rabbit_hole": "^1.0@beta",
         "drupal/radix": "^5.0",
         "drupal/redirect": "^1.6",
         "drupal/simple_sitemap": "^4.1",
         "drupal/stage_file_proxy": "^2.0",
-        "drupal/styleguide": "^2.0",
         "drupal/ultimate_cron": "^2.0@alpha",
-        "drupal/webform": "^6.2@beta",
-        "drush/drush": "^11.0",
+        "drupal/webform": "^6.2",
+        "drush/drush": "^12.0",
         "metadrop/drupal-artifact-builder": "^1.4"
     },
     "require-dev": {
         "metadrop/drupal-dev": "^1.1.0",
-        "metadrop/drupal-boilerplate-assistant": "^1.0"
+        "metadrop/drupal-boilerplate-assistant": "^2.0@beta"
     },
     "conflict": {
         "drupal/drupal": "*"

docker-compose.yml

@@ -134,7 +134,7 @@ services:
   node:
     image: wodby/node:$NODE_TAG
     container_name: "${PROJECT_NAME}_node"
-    entrypoint: []
+    working_dir: ${THEME_PATH}
     command: tail -f /dev/null
 
 #  blackfire:
@@ -178,8 +178,6 @@ services:
   hub:
     image: selenium/hub:$HUB_TAG
     container_name: ${PROJECT_NAME}_hub
-    #ports:
-    #  - "4444:4444"
 
   chrome:
     image: selenium/node-chrome:$CHROME_TAG
@@ -188,8 +186,10 @@ services:
     depends_on:
       - hub
     environment:
-      - HUB_HOST=hub
-#      - HUB_PORT=4444
+      - SE_EVENT_BUS_HOST=hub
+      - SE_EVENT_BUS_PUBLISH_PORT=4442
+      - SE_EVENT_BUS_SUBSCRIBE_PORT=4443
+
 
   # BUG: Standalone chrome image can't be used until this is resolved:
   # https://bugs.chromium.org/p/chromedriver/issues/detail?id=3857

drush/sites/default.site.yml

@@ -0,0 +1,4 @@
+local:
+  uri: 'http://example.docker.localhost:8000'
+  root: '/var/www/html'
+  user: 'wodby'