From 07a934a91e13b081ddf993b67a5d133ab1b3f8b1 Mon Sep 17 00:00:00 2001
From: Steffen Vogel <post@steffenvogel.de>
Date: Wed, 28 Mar 2018 12:38:47 +0200
Subject: [PATCH] added production docker-compose files
---
docker-compose.override.yml | 7 +++++++
docker-compose.prod.yml | 17 +++++++++++++++++
docker-compose.yml | 25 ++++---------------------
3 files changed, 28 insertions(+), 21 deletions(-)
create mode 100644 docker-compose.override.yml
create mode 100644 docker-compose.prod.yml
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
new file mode 100644
index 0000000..737b985
--- /dev/null
+++ b/docker-compose.override.yml
@@ -0,0 +1,7 @@
+version: "2"
+
+services:
+ nginx:
+ ports:
+ - "80:80"
+ - "8080:8080"
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
new file mode 100644
index 0000000..f98c0a5
--- /dev/null
+++ b/docker-compose.prod.yml
@@ -0,0 +1,17 @@
+version: "2"
+
+networks:
+ webproxy:
+ default:
+ external: true
+
+services:
+ nginx:
+ environment:
+ VIRTUAL_HOST: web.villas.fein-aachen.org
+ LETSENCRYPT_HOST: web.villas.fein-aachen.org
+ LETSENCRYPT_EMAIL: post@steffenvogel.de
+ networks:
+ - default
+ - webproxy
+
diff --git a/docker-compose.yml b/docker-compose.yml
index d81b5d0..1c4cbbb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,10 +1,5 @@
version: "2"
-networks:
- default:
- webproxy:
- external: true
-
volumes:
database:
driver: local
@@ -34,16 +29,6 @@ services:
build:
context: .
dockerfile: Dockerfile.nginx
-# ports:
-# - "80:80"
-# - "8080:8080"
- environment:
- VIRTUAL_HOST: web.villas.fein-aachen.org
- LETSENCRYPT_HOST: web.villas.fein-aachen.org
- LETSENCRYPT_EMAIL: post@steffenvogel.de
- networks:
- - webproxy
- - default
# The MongoDB database for the VILLASweb backend
database:
@@ -61,7 +46,7 @@ services:
dockerfile: Dockerfile.node
privileged: true
restart: always
- command: node /etc/villas/node/websocket-demo-files.conf
+ command: node /etc/villas/node/websocket-demo.conf
volumes:
- ./etc/node:/etc/villas/node
ports:
@@ -75,6 +60,8 @@ services:
ME_CONFIG_MONGODB_SERVER: database
ME_CONFIG_BASICAUTH_USERNAME: admin
ME_CONFIG_BASICAUTH_PASSWORD: mongo-admin
+ depends_on:
+ - database
ports:
- "8081:8081"
@@ -85,10 +72,8 @@ services:
RABBITMQ_DEFAULT_USER: "villas"
RABBITMQ_DEFAULT_PASS: "s3c0sim4!"
ports:
- - "8080:15672"
+ - "8082:15672"
- "5672:5672"
- networks:
- - default
# A VILLAScontroller for creating some dummy simulators
controller:
@@ -98,5 +83,3 @@ services:
command: villas-ctl -b "amqp://villas:s3c0sim4!@broker/%2F" -c /etc/villas/controller/config.json daemon
depends_on:
- broker
- networks:
- - default
--
GitLab