diff --git a/.env b/.env index 517cd05a9..a741f2aa1 100644 --- a/.env +++ b/.env @@ -18,13 +18,10 @@ DB_DRIVER=mysql ### --- MARIADB ---- -MARIADB_TAG=10.11-3.29.0 -#MARIADB_TAG=11.2-3.29.0 -#MARIADB_TAG=11.1-3.29.0 -#MARIADB_TAG=11.0-3.29.0 +MARIADB_TAG=11.4-3.29.0 +#MARIADB_TAG=10.11-3.29.0 #MARIADB_TAG=10.6-3.29.0 #MARIADB_TAG=10.5-3.29.0 -#MARIADB_TAG=10.4-3.29.0 ### --- VANILLA DRUPAL ---- @@ -103,7 +100,6 @@ POSTGRES_TAG=16-1.34.3 ADMINER_TAG=4-3.26.0 APACHE_TAG=2.4-4.14.5 -DRUPAL_NODE_TAG=1.0-2.0.0 MEMCACHED_TAG=1-2.17.6 OPENSMTPD_TAG=7-1.22.3 RSYSLOG_TAG=latest diff --git a/README.md b/README.md index c267055b4..8a32eb899 100644 --- a/README.md +++ b/README.md @@ -15,34 +15,33 @@ Docker4Drupal is a set of docker images optimized for Drupal. Use `compose.yml` The Drupal stack consist of the following containers: -| Container | Versions | Image | ARM64 support | Enabled by default | -|-----------------|-----------------------------|------------------------------|---------------|--------------------| -| [Nginx] | 1.27, 1.26 | [wodby/nginx] | ✓ | ✓ | -| [Apache] | 2.4 | [wodby/apache] | ✓ | | -| [Drupal] | 11, 10, 7 | [wodby/drupal] | ✓ | ✓ | -| [PHP] | 8.3, 8.2, 8.1 | [wodby/drupal-php] | ✓ | | -| Crond | | [wodby/drupal-php] | ✓ | ✓ | -| [MariaDB] | 11, 10.11, 10.6, 10.5, 10.4 | [wodby/mariadb] | ✓ | ✓ | -| [PostgreSQL] | 16, 15, 14, 13, 12 | [wodby/postgres] | ✓ | | -| [Valkey] | 7 | [wodby/valkey] | ✓ | | -| [Memcached] | 1 | [wodby/memcached] | | | -| [Varnish] | 6.0 | [wodby/varnish] | ✓ | | -| [Node.js] | 20, 18 | [wodby/node] | | | -| [Drupal node] | 1.0 | [wodby/drupal-node] | | | -| [Solr] | 8, 7, 6, 5 | [wodby/solr] | | | -| Zookeeper | 3.8 | [zookeeper] | ✓ | | -| [Elasticsearch] | 7 | [wodby/elasticsearch] | | | -| [Kibana] | 7 | [wodby/kibana] | | | -| [OpenSMTPD] | 7 | [wodby/opensmtpd] | ✓ | | -| Mailpit | latest | [axllent/mailpit] | ✓ | ✓ | -| Gotenberg | latest | [gotenberg/gotenberg] | ✓ | | -| [Rsyslog] | latest | [wodby/rsyslog] | | | -| [Webgrind] | 1 | [wodby/webgrind] | ✓ | | -| [Xhprof viewer] | latest | [wodby/xhprof] | ✓ | | -| Adminer | 4.6 | [wodby/adminer] | ✓ | | -| phpMyAdmin | latest | [phpmyadmin/phpmyadmin] | | | -| Selenium chrome | 3.141 | [selenium/standalone-chrome] | | | -| Traefik | latest | [_/traefik] | ✓ | ✓ | +| Container | Versions | Image | ARM64 support | Enabled by default | +|-----------------|-------------------------|------------------------------|---------------|--------------------| +| [Nginx] | 1.27, 1.26 | [wodby/nginx] | ✓ | ✓ | +| [Apache] | 2.4 | [wodby/apache] | ✓ | | +| [Drupal] | 11, 10, 7 | [wodby/drupal] | ✓ | ✓ | +| [PHP] | 8.3, 8.2, 8.1 | [wodby/drupal-php] | ✓ | | +| Crond | | [wodby/drupal-php] | ✓ | ✓ | +| [MariaDB] | 11.4, 10.11, 10.6, 10.5 | [wodby/mariadb] | ✓ | ✓ | +| [PostgreSQL] | 16, 15, 14, 13, 12 | [wodby/postgres] | ✓ | | +| [Valkey] | 7 | [wodby/valkey] | ✓ | | +| [Memcached] | 1 | [wodby/memcached] | | | +| [Varnish] | 6.0 | [wodby/varnish] | ✓ | | +| [Node.js] | 22, 20, 18 | [wodby/node] | | | +| [Solr] | 8, 7, 6, 5 | [wodby/solr] | | | +| Zookeeper | 3.8 | [zookeeper] | ✓ | | +| [Elasticsearch] | 7 | [wodby/elasticsearch] | | | +| [Kibana] | 7 | [wodby/kibana] | | | +| [OpenSMTPD] | 7 | [wodby/opensmtpd] | ✓ | | +| Mailpit | latest | [axllent/mailpit] | ✓ | ✓ | +| Gotenberg | latest | [gotenberg/gotenberg] | ✓ | | +| [Rsyslog] | latest | [wodby/rsyslog] | | | +| [Webgrind] | 1 | [wodby/webgrind] | ✓ | | +| [Xhprof viewer] | latest | [wodby/xhprof] | ✓ | | +| Adminer | 4.6 | [wodby/adminer] | ✓ | | +| phpMyAdmin | latest | [phpmyadmin/phpmyadmin] | | | +| Selenium chrome | 3.141 | [selenium/standalone-chrome] | | | +| Traefik | latest | [_/traefik] | ✓ | ✓ | ## Documentation @@ -80,7 +79,6 @@ Docker4Drupal is a project designed to help you spin up local environment with D This project is licensed under the MIT open source license. [Apache]: https://wodby.com/docs/stacks/drupal/containers#apache -[Drupal node]: https://wodby.com/docs/stacks/drupal/containers#drupal-nodejs [Drupal]: https://wodby.com/docs/stacks/drupal/containers#php [Elasticsearch]: https://wodby.com/docs/stacks/elasticsearch [Kibana]: https://wodby.com/docs/stacks/elasticsearch @@ -106,7 +104,6 @@ This project is licensed under the MIT open source license. [selenium/standalone-chrome]: https://hub.docker.com/r/selenium/standalone-chrome [wodby/adminer]: https://hub.docker.com/r/wodby/adminer [wodby/apache]: https://github.com/wodby/apache -[wodby/drupal-node]: https://github.com/wodby/drupal-node [wodby/drupal-php]: https://github.com/wodby/drupal-php [wodby/drupal]: https://github.com/wodby/drupal [wodby/elasticsearch]: https://github.com/wodby/elasticsearch diff --git a/tests/10/.env b/tests/10/.env index d687ca8a2..1ff305918 100644 --- a/tests/10/.env +++ b/tests/10/.env @@ -5,7 +5,7 @@ DB_ROOT_PASSWORD=password DB_HOST=mariadb DB_DRIVER=mysql -MARIADB_TAG=10.11-3.29.0 +MARIADB_TAG=11.4-3.29.0 VALKEY_TAG=7-0.2.0 VARNISH_TAG=6.0-4.18.2 SOLR_TAG=8-4.18.2 diff --git a/tests/11/.env b/tests/11/.env index 54b1f5b9a..1efec354c 100644 --- a/tests/11/.env +++ b/tests/11/.env @@ -5,7 +5,7 @@ DB_ROOT_PASSWORD=password DB_HOST=mariadb DB_DRIVER=mysql -MARIADB_TAG=10.11-3.29.0 +MARIADB_TAG=11.4-3.29.0 VALKEY_TAG=7-0.2.0 VARNISH_TAG=6.0-4.18.2 SOLR_TAG=8-4.18.2 diff --git a/tests/7/.env b/tests/7/.env index c43260815..cf8ec8188 100644 --- a/tests/7/.env +++ b/tests/7/.env @@ -5,7 +5,7 @@ DB_ROOT_PASSWORD=password DB_HOST=mariadb DB_DRIVER=mysql -MARIADB_TAG=10.11-3.29.0 +MARIADB_TAG=11.4-3.29.0 VALKEY_TAG=7-0.2.0 VARNISH_TAG=6.0-4.18.2 SOLR_TAG=7-4.15.0