Merge pull request #13 from AEGEE/feat/goodmanifest

impr(docker): manifest is now perfect

docker/docker-compose.dev.yml

@@ -0,0 +1,12 @@
+version: "3.4"
+
+services:
+ oms-discounts:
+ build:
+ context: ./${PATH_OMS_DISCOUNTS}/..
+ dockerfile: ./docker/oms-discounts/Dockerfile.dev
+ image: aegee/oms-discounts:latest
+ volumes:
+ - /usr/app/src/node_modules
+ - ./${PATH_OMS_DISCOUNTS}/../:/usr/app/src
+ command: "sh /usr/app/scripts/bootstrap.sh && npm nodemon-start"

docker/docker-compose.yml

@@ -1,4 +1,4 @@
-version: '3.2'
+version: "3.4"
 ### OMS DISCOUNTS #######################################
 services:
  postgres-oms-discounts:
@@ -8,34 +8,46 @@ services:
  expose:
  - "5432"
  environment:
- POSTGRES_USER: postgres
- POSTGRES_PASSWORD: ${PW_POSTGRES}
+ POSTGRES_USER: "postgres"
+ POSTGRES_PASSWORD: "${PW_POSTGRES}"
+
  oms-discounts:
- build:
- context: ./$PATH_OMS_DISCOUNTS/..
- dockerfile: ./docker/oms-discounts/Dockerfile.dev
- image: aegee/oms-discounts:dev
+ image: aegee/oms-discounts:stable
  volumes:
  - oms-discounts-media:/usr/app/media
- - ./$PATH_OMS_DISCOUNTS/../:/usr/app/src
  - shared:/usr/app/shared:ro
- links:
+ depends_on:
  - postgres-oms-discounts
  expose:
  - "8084"
  environment:
- BUGSNAG_KEY: bbef84ab99c91665262f672ba6507a2d
- PG_PASSWORD: ${PW_POSTGRES}
+ BUGSNAG_KEY: "${BUGSNAG_KEY_DISCOUNTS}"
+ PG_PASSWORD: "${PW_POSTGRES}"
+ NODE_ENV: "${MYAEGEE_ENV}"
+ healthcheck:
+ test: ["CMD", "curl", "-f", "http://localhost:8084/healthcheck"]
+ interval: 30s
+ timeout: 10s
+ retries: 3
+ start_period: 40s
+ # cpu_count: 1
+ # mem_limit: 900m
  labels:
  - "traefik.backend=oms-discounts"
  - "traefik.port=8084"
  - "traefik.frontend.rule=PathPrefix:/services/oms-discounts/api;PathPrefixStrip:/services/oms-discounts/api"
  - "traefik.frontend.priority=110"
  - "traefik.enable=true"
+
 volumes:
  postgres-oms-discounts:
- driver: "local"
+ driver: local
  oms-discounts-media:
- driver: "local"
+ driver: local
  shared:
- driver: "local"
+ driver: local
+
+networks:
+ default:
+ external:
+ name: OMS

package.json

@@ -5,6 +5,7 @@
  "main": "lib/run.js",
  "scripts": {
  "start": "nodemon -e 'js,json' lib/run.js",
+ "nodemon-start": "nodemon -e 'js,json' lib/run.js",
  "lint": "eslint .",
  "version": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0 && git add CHANGELOG.md",
  "db:create": "sequelize db:create",