From 6903e19e31091e90040c797acfa3e9c160db30fd Mon Sep 17 00:00:00 2001 From: Chingis Sandanov Date: Thu, 26 Apr 2018 17:30:58 +0700 Subject: [PATCH] Replace node image, add elasticsearch and kibana --- .env | 7 +++++++ docker-compose.yml | 20 +++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/.env b/.env index 704a655dc4..bd20412a1b 100644 --- a/.env +++ b/.env @@ -81,6 +81,11 @@ SOLR_TAG=8-6.6-2.4.0 REDIS_TAG=4.0-2.1.5 #REDIS_TAG=3.2-2.1.5 +### --- NODE --- + +NODE_TAG=9.11-0.2.0 +#NODE_TAG=8.11-0.2.0 + ### --- POSTGRESQL ---- POSTGRES_TAG=10.1-1.3.0 @@ -99,3 +104,5 @@ MEMCACHED_TAG=1.4-2.0.0 RSYSLOG_TAG=latest VARNISH_TAG=4.1-2.3.0 WEBGRIND_TAG=1.5-1.3.0 +ELASTICSEARCH_TAG=2.1.0 +KIBANA_TAG=2.0.0 \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index be72afa91d..714a9554c1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -186,7 +186,7 @@ services: # WEAVER_CONVERSION_FALLBACK: "false" # node: -# image: node:alpine +# image: wodby/node:$NODE_TAG # container_name: "${PROJECT_NAME}_node" # working_dir: /app # labels: @@ -218,6 +218,24 @@ services: # volumes: # - files:/mnt/files +# elasticsearch: +# image: wodby/elasticsearch:$ELASTICSEARCH_TAG +# environment: +# ES_JAVA_OPTS: "-Xms500m -Xmx500m" +# ulimits: +# memlock: +# soft: -1 +# hard: -1 + +# kibana: +# image: wodby/kibana:$KIBANA_TAG +# depends_on: +# - elasticsearch +# labels: +# - 'traefik.backend=kibana' +# - 'traefik.port=5601' +# - 'traefik.frontend.rule=Host:kibana.php.docker.localhost' + portainer: image: portainer/portainer container_name: "${PROJECT_NAME}_portainer"