From bf6be1a22b7b7fcbb04b895612780364d9eb9c49 Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Fri, 2 Sep 2016 03:49:55 +0700 Subject: [PATCH 1/2] Create docker-compose.yml and to link the other two together.... --- docker-compose.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 docker-compose.yml diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 00000000..a4bd0699 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,19 @@ +version: '2' +services: + web: + build: web/ + hostname: gocryptotraderweb + container_name: web + ports: + - "3333:80" + networks: + - app + cli: + build: . + hostname: gocryptotrader + container_name: daemon + privileged: true + networks: + - app +networks: + - app From 4dc886d6ec094ca664686d2ee16000059fac6e48 Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Thu, 1 Sep 2016 22:59:56 +0200 Subject: [PATCH 2/2] I certify this as working. --- Dockerfile | 2 +- docker-compose.yml | 6 ------ web/Dockerfile | 2 +- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3e9881a3..e0abbc65 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,3 @@ FROM golang:onbuild -COPY config-example.json /usr/bin/config.json +COPY config_example.json config.json diff --git a/docker-compose.yml b/docker-compose.yml index a4bd0699..edc093cc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,14 +6,8 @@ services: container_name: web ports: - "3333:80" - networks: - - app cli: build: . hostname: gocryptotrader container_name: daemon privileged: true - networks: - - app -networks: - - app diff --git a/web/Dockerfile b/web/Dockerfile index 2e7d9577..bf45650a 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -1 +1 @@ -FROM node-onbuild +FROM node:onbuild