Replace node image, add elasticsearch and kibana

wodby · Apr 26, 2018 · 4194481 · 4194481
1 parent 6903e19
commit 4194481
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 24 deletions.
diff --git a/.env b/.env
@@ -76,6 +76,24 @@ SOLR_TAG=8-6.6-2.4.0
 #SOLR_TAG=8-7.2-2.4.0
 #SOLR_TAG=7-5.4-2.4.0
 
+### --- ELASTICSEARCH ---
+
+ELASTICSEARCH_TAG=6.2-2.2.0
+#ELASTICSEARCH_TAG=6.1-2.2.0
+#ELASTICSEARCH_TAG=6.0-2.2.0
+#ELASTICSEARCH_TAG=5.6-2.2.0
+#ELASTICSEARCH_TAG=5.5-2.2.0
+#ELASTICSEARCH_TAG=5.4-2.2.0
+
+### --- KIBANA ---
+
+KIBANA_TAG=6.2-2.1.0
+#KIBANA_TAG=6.1-2.1.0
+#KIBANA_TAG=6.0-2.1.0
+#KIBANA_TAG=5.6-2.1.0
+#KIBANA_TAG=5.5-2.1.0
+#KIBANA_TAG=5.4-2.1.0
+
 ### --- REDIS ---
 
 REDIS_TAG=4.0-2.1.5

diff --git a/README.md b/README.md
@@ -21,6 +21,9 @@ Read [**Getting Started**](http://wodby.com/stacks/drupal/docs/local/quick-start
 [wodby/redis]: https://github.com/wodby/redis
 [wodby/drupal-varnish]: https://github.com/wodby/drupal-varnish
 [wodby/drupal-solr]: https://github.com/wodby/drupal-solr
+[wodby/elasticsearch]: https://github.com/wodby/elasticsearch
+[wodby/kibana]: https://github.com/wodby/kibana
+[wodby/node]: https://github.com/wodby/node
 [wodby/drupal-node]: https://github.com/wodby/drupal-node
 [wodby/memcached]: https://github.com/wodby/memcached
 [wodby/webgrind]: https://hub.docker.com/r/wodby/webgrind
@@ -31,34 +34,35 @@ Read [**Getting Started**](http://wodby.com/stacks/drupal/docs/local/quick-start
 [wodby/adminer]: https://hub.docker.com/r/wodby/adminer
 [phpmyadmin/phpmyadmin]: https://hub.docker.com/r/phpmyadmin/phpmyadmin
 [portainer/portainer]: https://hub.docker.com/r/portainer/portainer
-[_/node]: https://hub.docker.com/_/node
 [_/traefik]: https://hub.docker.com/_/traefik
 
 The Drupal stack consist of the following containers:
 
-| Container  | Versions           | Service name | Image                              | Enabled by default |
-| ---------- | ------------------ | ------------ | ---------------------------------- | ------------------ |
-| Nginx      | 1.13, 1.12         | `nginx`      | [wodby/drupal-nginx]               | ✓                  |
-| Apache     | 2.4                | `apache`     | [wodby/php-apache]                 |                    |
-| Drupal     | 8, 7, 6            | `php`        | [wodby/drupal]                     | ✓                  |
-| PHP        | 7.1, 7.0, 5.6, 5.3 | `php`        | [wodby/drupal-php]                 |                    |
-| MariaDB    | 10.2, 10.1         | `mariadb`    | [wodby/mariadb]                    | ✓                  |
-| PostgreSQL | 10.1, 9.6          | `postgres`   | [wodby/postgres]                   |                    |
-| Redis      | 4.0, 3.2           | `redis`      | [wodby/redis]                      |                    |
-| Varnish    | 4.1                | `varnish`    | [wodby/drupal-varnish]             |                    |
-| Solr       | 7.x, 6.x, 5.5, 5.4 | `solr`       | [wodby/drupal-solr]                |                    |
-| Node.js    | 1.0                | `nodejs`     | [wodby/drupal-node]                |                    |
-| Memcached  | 1.4                | `memcached`  | [wodby/memcached]                  |                    |
-| Webgrind   | 1.5                | `webgrind`   | [wodby/webgrind]                   |                    |
-| Blackfire  | latest             | `blackfire`  | [blackfire/blackfire]              |                    |
-| Rsyslog    | latest             | `rsyslog`    | [wodby/rsyslog]                    |                    |
-| AthenaPDF  | 2.10.0             | `athenapdf`  | [arachnysdocker/athenapdf-service] |                    |
-| Mailhog    | latest             | `mailhog`    | [mailhog/mailhog]                  | ✓                  |
-| Adminer    | 4.3                | `adminer`    | [wodby/adminer]                    |                    |
-| phpMyAdmin | latest             | `pma`        | [phpmyadmin/phpmyadmin]            |                    |
-| Node       | latest             | `node`       | [_/node]                           |                    |
-| Portainer  | latest             | `portainer`  | [portainer/portainer]              | ✓                  |
-| Traefik    | latest             | `traefik`    | [_/traefik]                        | ✓                  |
+| Container     | Versions           | Service name    | Image                              | Enabled by default |
+| ------------- | ------------------ | ------------    | ---------------------------------- | ------------------ |
+| Nginx         | 1.14, 1.13         | `nginx`         | [wodby/drupal-nginx]               | ✓                  |
+| Apache        | 2.4                | `apache`        | [wodby/php-apache]                 |                    |
+| Drupal        | 8, 7, 6            | `php`           | [wodby/drupal]                     | ✓                  |
+| PHP           | 7.1, 7.0, 5.6, 5.3 | `php`           | [wodby/drupal-php]                 |                    |
+| MariaDB       | 10.2, 10.1         | `mariadb`       | [wodby/mariadb]                    | ✓                  |
+| PostgreSQL    | 10.1, 9.6          | `postgres`      | [wodby/postgres]                   |                    |
+| Redis         | 4.0, 3.2           | `redis`         | [wodby/redis]                      |                    |
+| Varnish       | 4.1                | `varnish`       | [wodby/drupal-varnish]             |                    |
+| Node          | 9, 8               | `node`          | [wodby/node]                       |                    |
+| Drupal node   | 1.0                | `nodejs`        | [wodby/drupal-node]                |                    |
+| Solr          | 7.x, 6.x, 5.5, 5.4 | `solr`          | [wodby/drupal-solr]                |                    |
+| Elasticsearch | 6.x, 5.6, 5.5, 5.4 | `elasticsearch` | [wodby/elasticsearch]              |                    |
+| Kibana        | 6.x, 5.6, 5.5, 5.4 | `kibana`        | [wodby/kibana]                     |                    |
+| Memcached     | 1.4                | `memcached`     | [wodby/memcached]                  |                    |
+| Webgrind      | 1.5                | `webgrind`      | [wodby/webgrind]                   |                    |
+| Blackfire     | latest             | `blackfire`     | [blackfire/blackfire]              |                    |
+| Rsyslog       | latest             | `rsyslog`       | [wodby/rsyslog]                    |                    |
+| AthenaPDF     | 2.10.0             | `athenapdf`     | [arachnysdocker/athenapdf-service] |                    |
+| Mailhog       | latest             | `mailhog`       | [mailhog/mailhog]                  | ✓                  |
+| Adminer       | 4.3                | `adminer`       | [wodby/adminer]                    |                    |
+| phpMyAdmin    | latest             | `pma`           | [phpmyadmin/phpmyadmin]            |                    |
+| Portainer     | latest             | `portainer`     | [portainer/portainer]              | ✓                  |
+| Traefik       | latest             | `traefik`       | [_/traefik]                        | ✓                  |
 
 Supported Drupal versions: 8 / 7 / 6