DOCKER: changed docker compose file to start everything the server needs - but not the server

cmake/docker.cmake

@@ -83,8 +83,8 @@ macro(engine_docker NAME)
 			add_custom_target(${NAME}-docker-compose-build
 				COMMAND
 					${DOCKERCOMPOSE_EXECUTABLE}
-					${DOCKERCOMPOSE_BUILD_ARGS}
 					build
+					${DOCKERCOMPOSE_BUILD_ARGS}
 				WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
 				VERBATIM
 				DEPENDS ${DOCKERCOMPOSEFILE_SRC} ${DOCKERFILE_TARGET} ${DOCKERFILE_SRC}
@@ -92,8 +92,8 @@ macro(engine_docker NAME)
 			add_custom_target(${NAME}-docker-compose-up
 				COMMAND
 					${DOCKERCOMPOSE_EXECUTABLE}
-					${DOCKERCOMPOSE_UP_ARGS}
 					up
+					${DOCKERCOMPOSE_UP_ARGS}
 				WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
 				VERBATIM
 				DEPENDS ${DOCKERCOMPOSEFILE_SRC} ${DOCKERFILE_TARGET} ${DOCKERFILE_SRC}

src/server/docker-compose.yml.in

@@ -13,23 +13,37 @@ services:
     ports:
       - 5432:5432
 
-  app:
-    build:
-      context: @ROOT_DIR@
-      dockerfile: @DOCKERFILE_TARGET@
-      args:
-        buildno: 1
+  influxdb:
+    image: influxdb:1.7-alpine
     restart: always
+    volumes:
+      - influxdb:/var/lib/influxdb
     ports:
-      - 11337:11337
-    environment:
-      DB_HOST: db
-      DB_NAME: vengi
-      DB_USER: vengi
-      DB_PW: @DB_PW@
-    depends_on:
-      - db
+      - 8083:8083
+      - 8086:8086
+      - 8090:8090
+
+  telegraf:
+    image: telegraf:latest
+    container_name: telegraf
+    ports:
+      - "8092:8092/udp"
+    links:
+      - influxdb
+    volumes:
+      - @CMAKE_CURRENT_SOURCE_DIR@/telegraf.conf:/etc/telegraf/telegraf.conf:ro
+
+  grafana:
+    image: grafana/grafana:6.4.1
+    restart: always
+    volumes:
+      - grafana:/var/lib/grafana
+    ports:
+      - 3000:3000
+    links:
+      - influxdb
 
 volumes:
   db:
-
+  influxdb:
+  grafana: