Move to docker-compose v3 + Fix variabilzation of the liberty version

Author: lgrateau

decisionserver/decisionserverruntime/Dockerfile

@@ -1,4 +1,4 @@
-ARG FROMLIBERTY=websphere-liberty:webProfile7
+ARG FROMLIBERTY
 FROM maven:3.5.2-jdk-8-alpine AS builder
 ARG ODMDOCKERDIR
 ENV ODMDOCKERDIR $ODMDOCKERDIR

odm-cluster.yml

@@ -28,6 +28,7 @@ services:
       args:
         - ODMDOCKERDIR=$ODMDOCKERDIR
         - ODMVERSION=$ODMVERSION
+        - FROMLIBERTY=$FROMLIBERTY
     links:
     - dbserver
     environment:
@@ -45,6 +46,7 @@ services:
       args:
         - ODMDOCKERDIR=$ODMDOCKERDIR
         - ODMVERSION=$ODMVERSION
+        - FROMLIBERTY=$FROMLIBERTY
     links:
     - dbserver
     - odm-decisionserverconsole
@@ -61,6 +63,7 @@ services:
       args:
         - ODMDOCKERDIR=$ODMDOCKERDIR
         - ODMVERSION=$ODMVERSION
+        - FROMLIBERTY=$FROMLIBERTY
     links:
     - dbserver
     - odm-decisionserverconsole
@@ -79,6 +82,7 @@ services:
       args:
         - ODMDOCKERDIR=$ODMDOCKERDIR
         - ODMVERSION=$ODMVERSION
+        - FROMLIBERTY=$FROMLIBERTY
     links:
     - dbserver
     depends_on:

odm-standalone-postgres.yml

@@ -1,4 +1,4 @@
-version: '2'
+version: '3'
 services:
   dbserver:
     image: postgres:9.5.10

odm-standalone-tomcat.yml

@@ -1,4 +1,4 @@
-version: '2'
+version: '3'
 services:
   # This following property is defined in the .env file. It's allow to customize your docker images.
   # ODMVERSION : The Operational Decision Management version

odm-standalone.yml

@@ -1,4 +1,4 @@
-version: '2'
+version: '3'
 services:
   # This following property is defined in the .env file. It's allow to customize your docker images.
   # ODMVERSION : The Operational Decision Management version

override-derby.yml

@@ -1,4 +1,4 @@
-version: '2'
+version: '3'
 services:
   dbserver:
     build:
@@ -15,7 +15,7 @@ services:
       - DB_TYPE=derby
       # DB_TYPE could be set to "derby", "mysql" or "postgres". If it is not set, the PostgreSQL database is used by default.
       # DB_DRIVER_URL could be used optionally to override the driver that is used by default for a given database.
-    
+
   odm-decisionrunner:
     environment:
       - DB_TYPE=derby
@@ -32,4 +32,4 @@ services:
     environment:
       - DB_TYPE=derby
       # DB_TYPE could be set to "derby", "mysql" or "postgres". If it is not set, the PostgreSQL database is used by default.
-      # DB_DRIVER_URL could be used optionally to override the driver that is used by default for a given database.
+      # DB_DRIVER_URL could be used optionally to override the driver that is used by default for a given database.

override-mysql.yml

@@ -1,4 +1,4 @@
-version: '2'
+version: '3'
 services:
   dbserver:
     build:
@@ -16,7 +16,7 @@ services:
       - DB_TYPE=mysql
       # DB_TYPE could be set to "derby", "mysql" or "postgres". If it is not set, the PostgreSQL database is used by default.
       # DB_DRIVER_URL could be used optionally to override the driver that is used by default for a given database.
-    
+
   odm-decisionrunner:
      environment:
       - DB_TYPE=mysql
@@ -33,4 +33,4 @@ services:
      environment:
       - DB_TYPE=mysql
       # DB_TYPE could be set to "derby", "mysql" or "postgres". If it is not set, the PostgreSQL database is used by default.
-      # DB_DRIVER_URL could be used optionally to override the driver that is used by default for a given database.
+      # DB_DRIVER_URL could be used optionally to override the driver that is used by default for a given database.

override-openldap.yml

@@ -1,4 +1,4 @@
-version: '2'
+version: '3'
 services:
   openldap:
     image: $REPOSITORY/openldap:$ODMVERSION
@@ -45,7 +45,7 @@ services:
       - "636:636"
     domainname: "example.org" # important: same as hostname
     hostname: "example.org"
-    
+
   phpldapadmin:
     image: osixia/phpldapadmin:0.7.0
     #image: osixia/phpldapadmin:latest
@@ -57,25 +57,25 @@ services:
       - "8080:80"
     depends_on:
       - openldap
-      
+
   odm-decisionserverconsole:
     depends_on:
       - openldap
     volumes:
       - ./ldap/auth:/config/auth
-    
+
   odm-decisionrunner:
     depends_on:
       - openldap
     volumes:
       - ./ldap/auth:/config/auth
-    
+
   odm-decisionserverruntime:
     depends_on:
       - openldap
     volumes:
       - ./ldap/auth:/config/auth
-    
+
   odm-decisioncenter:
     depends_on:
       - openldap

standalone/Dockerfile

@@ -1,3 +1,4 @@
+ARG FROMLIBERTY
 FROM maven:3.5.2-jdk-8-alpine AS builder
 ARG ODMDOCKERDIR
 ENV ODMDOCKERDIR $ODMDOCKERDIR
@@ -59,7 +60,7 @@ COPY ./executionserver/lib/jaxws $THIRDPARTY
 # End Fix
 RUN $SCRIPT/loadFeatures.sh $SCRIPT
 
-FROM websphere-liberty:webProfile7
+FROM ${FROMLIBERTY}
 ARG ODMDOCKERDIR
 ARG ODMVERSION
 LABEL maintainer="ODMDev [email protected]"