Dockerfile and docker-compose modified, init

Author: Manuel Perez Belmonte

Dockerfile

@@ -1,3 +1,10 @@
 FROM openjdk:8-jre-alpine
-COPY target/elastest-cost-engine-0.0.1-SNAPSHOT.jar /ece.jar
-CMD java -jar /ece.jar
+EXPOSE 8888
+
+ADD conf/ece.conf ece.conf
+ADD target/elastest-cost-engine-0.0.2-SNAPSHOT.jar ece.jar
+ADD run.sh run.sh
+
+RUN chmod +x run.sh
+
+CMD ["/bin/ash", "run.sh"]

conf/ece.conf

@@ -1,6 +1,6 @@
 # Hibernate connection credentials
-HibernateURL=jdbc:postgresql://localhost/ece2
-HibernateUsername=ubuntu
-HibernatePassword=pass1234
+HibernateURL=jdbc:postgresql://postgres/ece
+HibernateUsername=elastest
+HibernatePassword=elastestpassword
 HibernateDriver=org.postgresql.Driver
 HibernateDialect=org.hibernate.dialect.PostgreSQL9Dialect

docker-compose.yml

@@ -0,0 +1,14 @@
+version: '3'
+
+services:
+  postgres:
+    image: ecepostgres
+    ports:
+      - 5432:5432
+    environment:
+      - POSTGRES_USER=elastest
+      - POSTGRES_PASSWORD=elastestpassword
+  ece:
+    image: ece
+    ports:
+      - 8888:8888

postgres/Dockerfile

@@ -0,0 +1,5 @@
+FROM postgres:9.6.4-alpine
+
+EXPOSE 5432:5432
+
+ADD db_init.sh /docker-entrypoint-initdb.d/init-user-db.sh

postgres/db_init.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+set -e
+
+psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" <<-EOSQL
+    CREATE DATABASE ece;
+EOSQL

run.sh

@@ -0,0 +1,3 @@
+sleep 5
+
+java -jar ece.jar ece.conf

src/main/java/io/elastest/ece/application/APIController.java

@@ -48,8 +48,8 @@ public class APIController {
 
     @PostConstruct
     public void init() {
-//        testCostModelValues();
-//        testTestValues();
+        testCostModelValues();
+        testTestValues();
     }
 
     @RequestMapping(value = "/", method = RequestMethod.GET)