diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml deleted file mode 100644 index b42de07..0000000 --- a/docker-compose.dev.yml +++ /dev/null @@ -1,36 +0,0 @@ -version: "3" -services: - nimble-redis: - image: redis - ports: - - "6379:6379" - command: redis-server - - nimble-client: - build: - dockerfile: Dockerfile.dev - context: ../client - volumes: - - /app/node_modules - - ../client:/usr/src/app - ports: - - "3000:3000" - stdin_open: true - - nimble-nginx: - restart: always - build: - dockerfile: Dockerfile - context: ./nginx - ports: - - "80:80" - - nimble-server: - build: - dockerfile: Dockerfile.dev - context: ../server - volumes: - - /app/node_modules - - ../server:/usr/src/app - ports: - - "3001:3001" diff --git a/docker-compose.yml b/docker-compose.yml index b4ee2ee..31d0738 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,3 +1,5 @@ +# for development + version: "3" services: nimble-redis: @@ -8,23 +10,21 @@ services: nimble-client: build: - dockerfile: Dockerfile + dockerfile: Dockerfile.dev context: ../client + volumes: + - /usr/src/app/node_modules + - ../client:/usr/src/app ports: - "3000:3000" stdin_open: true - nimble-nginx: - restart: always - build: - dockerfile: Dockerfile - context: ./nginx - ports: - - "80:80" - nimble-server: build: - dockerfile: Dockerfile + dockerfile: Dockerfile.dev context: ../server + volumes: + - /usr/src/app/node_modules + - ../server:/usr/src/app ports: - "3001:3001" diff --git a/nginx/Dockerfile b/nginx/Dockerfile deleted file mode 100644 index 85ae399..0000000 --- a/nginx/Dockerfile +++ /dev/null @@ -1,2 +0,0 @@ -FROM nginx -COPY ./default.conf /etc/nginx/conf.d/default.conf \ No newline at end of file diff --git a/nginx/default.conf b/nginx/default.conf deleted file mode 100644 index c4831df..0000000 --- a/nginx/default.conf +++ /dev/null @@ -1,26 +0,0 @@ -upstream nimble-client { - server nimble-client:3000; -} - -upstream nimble-server { - server nimble-server:3001; -} - -server { - listen 80; - - location / { - proxy_pass http://nimble-client; - } - - location /api { - proxy_pass http://nimble-server; - } - - location /ws { - proxy_pass http://nimble-client; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - } -} \ No newline at end of file