helper apps stuff all moved to helpers-stuff dir, exposed node-red da…

…ta/config, dropped including Dockerfiles
samtecspg · Jun 1, 2017 · 44fb3d9 · wrathagom · Jun 2, 2017 · milutz
1 parent 3382205
commit 44fb3d9
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 16 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -13,29 +13,31 @@ services:
       - elasticsearch
       - node-red
   node-red:
-    image: nodered/node-red-docker
+    image: nodered/node-red-docker:${NODERED_VERSION}
     ports: ['1880:1880']
+    volumes:
+      - ${NODERED_CONFIG:-./helpers-stuff/node-red}:/data
     networks: ['ingest-net']
   elasticsearch:
-    build: elasticsearch/
+    image: docker.elastic.co/elasticsearch/elasticsearch:${ELASTIC_VERSION:-5.4.0}
     environment:
       - "ES_JAVA_OPTS=-Xmx1g -Xms1g"
     ports: ['9200:9200']
     networks: ['ingest-net']
     volumes:
-      - ./elasticsearch/config/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml
-      - ${ES_DATA:-./es-data}:/usr/share/elasticsearch/data
+      - ${ES_CONFIG:-./helpers-stuff/elasticsearch.yml}:/usr/share/elasticsearch/config/elasticsearch.yml
+      - ${ES_DATA:-./helpers-stuff/es-data}:/usr/share/elasticsearch/data
     healthcheck:
       test: ['CMD', 'curl', '-f', '-u', '${ES_USER:-elastic}:${ES_PASSWORD:-changeme}', 'http://localhost:9200']
       interval: 1m30s
       timeout: 10s
       retries: 3
   kibana:
-    build: kibana/
+    image: docker.elastic.co/kibana/kibana:${ELASTIC_VERSION:-5.4.0}
     ports: ['5601:5601']
     networks: ['ingest-net']
     volumes:
-      - ./kibana/config/:/usr/share/kibana/config
+      - ${KIBANA_CONFIG:-./helpers-stuff/kibana.yml}:/usr/share/kibana/config/kibana.yml
     depends_on:
       - elasticsearch
     healthcheck:

diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile
diff --git a/elasticsearch/config/elasticsearch.yml → helpers-stuff/elasticsearch.yml b/elasticsearch/config/elasticsearch.yml → helpers-stuff/elasticsearch.yml
diff --git a/es-data/.gitignore → helpers-stuff/es-data/.gitignore b/es-data/.gitignore → helpers-stuff/es-data/.gitignore
diff --git a/kibana/config/kibana.yml → helpers-stuff/kibana.yml b/kibana/config/kibana.yml → helpers-stuff/kibana.yml
diff --git a/helpers-stuff/node-red/.gitignore b/helpers-stuff/node-red/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
diff --git a/kibana/Dockerfile b/kibana/Dockerfile
diff --git a/node-red/Dockerfile b/node-red/Dockerfile