Skip to content

Commit

Permalink
Replace node image, add elasticsearch and kibana
Browse files Browse the repository at this point in the history
  • Loading branch information
csandanov committed Apr 26, 2018
1 parent 8991169 commit 6903e19
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 1 deletion.
7 changes: 7 additions & 0 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
20 changes: 19 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit 6903e19

Please sign in to comment.