fix(docker): added proper dockerfile and docker-compose. Fixes MEMB-613

AEGEE · Sep 12, 2019 · 96167d1 · 96167d1
1 parent 24e01e9
commit 96167d1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -61,7 +61,7 @@ jobs:
       image: ubuntu-1604:201903-01
     steps:
       - checkout
-      - run: (cd docker/oms-events/ && docker build  --tag aegee/oms-events:$(node -p "require('../../package.json').version") --tag aegee/oms-events:latest -f Dockerfile.dev .)
+      - run: docker build  --tag aegee/oms-events:$(node -p "require('./package.json').version") --tag aegee/oms-events:latest -f docker/oms-events/Dockerfile.dev .
       - run: docker login --username $DOCKER_LOGIN --password $DOCKER_PASSWORD
       - run: docker push aegee/oms-events:$(node -p "require('./package.json').version")
       - run: docker push aegee/oms-events:latest

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -8,16 +8,16 @@ services:
         volumes:
             - postgres-events:/var/lib/postgresql/data
         expose:
-            - 5432
+            - "5432"
         environment:
             POSTGRES_USER: postgres
             POSTGRES_PASSWORD: ${PW_POSTGRES}
 
     oms-events:
         restart: on-failure
         build:
-            context: ./$PATH_OMS_EVENTS/oms-events
-            dockerfile: ./Dockerfile.dev
+            context: ./$PATH_OMS_EVENTS/..
+            dockerfile: ./docker/oms-events/Dockerfile.dev
         image: aegee/oms-events:dev
         volumes:
             - oms-events-media:/usr/app/media
@@ -26,7 +26,7 @@ services:
         links:
             - postgres-oms-events
         expose:
-            - 8084
+            - "8084"
         environment:
             BUGSNAG_KEY: 6f6a7c00507fceca0818c48405dbd2a6
             PG_PASSWORD: ${PW_POSTGRES}

diff --git a/docker/oms-events/Dockerfile.dev b/docker/oms-events/Dockerfile.dev
@@ -4,7 +4,8 @@ RUN mkdir -p /usr/app/src \
 	&& mkdir -p /usr/app/media \
 	&& mkdir -p /usr/app/scripts
 
-ADD ./bootstrap.sh /usr/app/scripts/bootstrap.sh
+COPY ./docker/oms-events/bootstrap.sh /usr/app/scripts/bootstrap.sh
+COPY . /usr/app/src
 
 RUN chown -R node:node /usr/app