Docker: updated startup parameters and allow for flags (for github-to…

…ken)

Dockerfile

@@ -8,9 +8,10 @@ RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv EA312927 \
 
 ENV PROJECT "time-tracker"
 ENV INSTALL_DIR /srv/time-tracker
-ENV PORT 12000
+ENV PORT 9000
 ENV MODE dev
 ENV LOGGER_XML ${INSTALL_DIR}/conf/application-logger-prod.xml
+ENV DB_NAME "time-tracker"
 
 RUN mkdir -p "$INSTALL_DIR"
 WORKDIR "$INSTALL_DIR"
@@ -25,4 +26,4 @@ RUN groupadd -r app-user \
 USER app-user
 
 
-ENTRYPOINT /bin/bash -c "./bin/time-tracker -Dconfig.file=${INSTALL_DIR}/conf/application_${MODE}.conf -Dhttp.port=$PORT -Dmongodb.url=mongo -Dmongodb.port=27017 -Dlogger.file=$LOGGER_XML $FLAGS"
+ENTRYPOINT /bin/bash -c "./bin/time-tracker -Dconfig.file=${INSTALL_DIR}/conf/application_${MODE}.conf -Dhttp.port=$PORT -Dmongodb.db=$DB_NAME -Dmongodb.url=mongo -Dmongodb.port=27017 -Dmongodb.uri=mongodb://mongo:27017/$DB_NAME -Dlogger.file=$LOGGER_XML $FLAGS"

README.md

@@ -52,14 +52,14 @@ docker build -t scalableminds/time-tracker-dev-env docker-helpers/time-tracker-d
 DOCKER_TAG_DEV=latest docker-compose run time-tracker-bower install
 
 # using sbt run
-DOCKER_TAG_DEV=latest docker-compose run --service-ports time-tracker-sbt-run
+DOCKER_TAG_DEV=latest FLAGS="-Dauthentication.github.clientId=<token_client_id> -Dauthentication.github.secret=<token_secret>" docker-compose run --service-ports time-tracker-sbt-run
 
 # make standalone image (compile with sbt)
 DOCKER_TAG_DEV=latest docker-compose run time-tracker-sbt clean compile stage
 docker build -t scalableminds/time-tracker .
 
 # run the standalone image
-DOCKER_TAG=latest docker-compose up time-tracker
+DOCKER_TAG=latest MODE=<dev/prod> FLAGS="-Dauthentication.github.clientId=<token_client_id> -Dauthentication.github.secret=<token_secret>" docker-compose up time-tracker
 ```
 
 ## Credits

circle.yml

@@ -24,7 +24,7 @@ dependencies:
 
 test:
   override:
-    - docker-compose up -d time-tracker:
+    - MODE=dev docker-compose up -d time-tracker:
         background: true
     - sleep 10
     - ./test/infrastructure/deployment.bash

docker-compose.yml

@@ -5,12 +5,12 @@ services:
   time-tracker:
     image: scalableminds/time-tracker:$DOCKER_TAG
     ports:
-      - "12000:12000"
+      - "9000:9000"
     links:
       - mongo
     environment:
-      - PORT=12000
-      - MODE=prod
+      - PORT=9000
+      - MODE=$MODE
       - FLAGS=$FLAGS
 
   time-tracker-dev:
@@ -29,10 +29,19 @@ services:
   time-tracker-sbt-run:
     extends:
       service: time-tracker-sbt
-    entrypoint: sbt -Dconfig.file=conf/application_dev.conf -Dmongodb.url=mongo -Dmongodb.port=27017
+    entrypoint: >
+      sbt
+      -Dconfig.file=conf/application_dev.conf
+      -Dmongodb.db=time-tracker
+      -Dmongodb.url=mongo
+      -Dmongodb.port=27017
+      -Dmongodb.uri=mongodb://mongo:27017/time-tracker
+      $FLAGS
     command: run
     ports:
       - "9000:9000"
+    environment:
+      - dev
     links:
       - mongo