diff --git a/docker-compose.yml b/docker-compose.yml index 440ee47..39a575a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,53 +2,27 @@ version: "2" services: voting-app: - build: ./voting-app/. + build: ./voting-app volumes: - ./voting-app:/app ports: - "5000:80" - links: - - redis - networks: - - front-tier - - back-tier - - result-app: - build: ./result-app/. - volumes: - - ./result-app:/app - ports: - - "5001:80" - links: - - db - networks: - - front-tier - - back-tier - - worker: - build: ./worker - links: - - db - - redis - networks: - - back-tier redis: image: redis:alpine ports: ["6379"] - networks: - - back-tier + + worker: + build: ./worker db: image: postgres:9.4 + + result-app: + build: ./result-app + command: nodemon --debug server.js volumes: - - "db-data:/var/lib/postgresql/data" - networks: - - back-tier - -volumes: - db-data: - -networks: - front-tier: - back-tier: + - ./result-app:/app + ports: + - "5001:80" + - "5858:5858" diff --git a/result-app/.vscode/launch.json b/result-app/.vscode/launch.json new file mode 100644 index 0000000..c081024 --- /dev/null +++ b/result-app/.vscode/launch.json @@ -0,0 +1,18 @@ +{ + "version": "0.2.0", + "configurations": [ + { + "name": "Attach", + "type": "node", + "request": "attach", + "port": 5858, + "address": "localhost", + "restart": true, + "sourceMaps": false, + "outDir": null, + "localRoot": "${workspaceRoot}", + "remoteRoot": "/app", + "timeout": 10000 + } + ] +} diff --git a/result-app/Dockerfile b/result-app/Dockerfile index 3045ede..d736db9 100644 --- a/result-app/Dockerfile +++ b/result-app/Dockerfile @@ -2,6 +2,7 @@ FROM node:5.11.0-slim WORKDIR /app +RUN npm install -g nodemon ADD package.json /app/package.json RUN npm config set registry http://registry.npmjs.org RUN npm install && npm ls