Merge c25ed89 into 6954beb

.travis.yml

@@ -14,8 +14,17 @@ jobs:
       if: branch = master
       script:
       - mvn docker:build@build-docker -P docker-app -f ./judge-d-server/pom.xml
+      - echo "Pushing to docker registry"
       - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
       - docker push hltech/judge-d
+      - echo "Pushing to heroku registry"
+      - docker login -u _ -p "$HEROKU_API_KEY" registry.heroku.com
+      - docker tag hltech/judge-d registry.heroku.com/judge-d/web
+      - docker push registry.heroku.com/judge-d/web
+    - stage: release app in heroku
+      if: branch = master
+      script:
+      - heroku container:release web -a judge-d
     - stage: build & publish docker image for agent
       if: branch = master
       script:

judge-d-agent/src/main/docker/Dockerfile

@@ -7,4 +7,4 @@ ADD ./judge-d-agent-0.1-SNAPSHOT.jar /root/judge-d-agent.jar
 ADD ./entrypoint.sh /root/entrypoint.sh
 RUN chmod +x /root/entrypoint.sh
 
-ENTRYPOINT ["/root/entrypoint.sh"]
+CMD ["/root/entrypoint.sh"]

judge-d-server/compose-judge-d.yml

@@ -11,5 +11,6 @@ services:
       - DB_PASSWORD=postgres
       - DB_DRIVER_CLASS=org.postgresql.Driver
       - PACT_BROKER_URL=http://some-host/
+      - PORT=8080
     external_links:
       - postgres

judge-d-server/src/main/docker/Dockerfile

@@ -5,4 +5,4 @@ ADD ./judge-d-server-0.1-SNAPSHOT.jar /root/judge-d.jar
 ADD ./entrypoint.sh /root/entrypoint.sh
 RUN chmod +x /root/entrypoint.sh
 
-ENTRYPOINT ["/root/entrypoint.sh"]
+CMD ["/root/entrypoint.sh"]

judge-d-server/src/main/resources/application.properties

@@ -1,5 +1,5 @@
 # embedded tomcat settings
-server.port=8080
+server.port=${PORT}
 server.tomcat.accesslog.enabled=true
 server.tomcat.accesslog.prefix=contract-verifier.access
 server.tomcat.accesslog.request-attributes-enabled=true