From 533793a09a7992a676fdde7e488a671f8bc659e1 Mon Sep 17 00:00:00 2001 From: sundowndev Date: Wed, 30 Oct 2019 00:01:23 +0100 Subject: [PATCH] refactor: docker setup --- client/public/index.html | 3 ++- docker-compose.yml | 22 +++++++++++----------- server/Dockerfile | 2 +- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/client/public/index.html b/client/public/index.html index 517ed81..a9c9b49 100644 --- a/client/public/index.html +++ b/client/public/index.html @@ -4,7 +4,7 @@ - + HETIC vs EEMI @@ -14,4 +14,5 @@
+ diff --git a/docker-compose.yml b/docker-compose.yml index 7db8365..f0d0576 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,7 +5,7 @@ services: container_name: hve_client restart: on-failure build: - context: . + context: ./client dockerfile: ./Dockerfile volumes: - ./client/nginx.conf:/etc/nginx/conf.d/default.conf:ro @@ -13,7 +13,9 @@ services: - NODE_ENV=production networks: - default - - web + #- web + ports: + - 8080:80 command: ['nginx', '-g', 'daemon off;'] # labels: # - 'traefik.docker.network=web' @@ -36,19 +38,17 @@ services: restart: on-failure image: node:8 build: - context: . - dockerfile: ./server/Dockerfile - env_file: - - .env + context: ./server + dockerfile: ./Dockerfile environment: - NODE_ENV=production ports: - '3000:3000' networks: - default - - postgres - command: ['node', '/api/server/index.js'] + #- web + command: ['node', 'index.js'] -networks: - web: - external: true +#networks: +# web: +# external: true diff --git a/server/Dockerfile b/server/Dockerfile index 76dd737..2014d4a 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -4,7 +4,7 @@ WORKDIR /api COPY ./package-lock.json . COPY ./package.json . -COPY ./server ./server +COPY . . # Build RUN npm install --prefix /api