Allow to configure liberty version in the .env file.

Author: lgrateau

.env

@@ -9,3 +9,6 @@ REPOSITORY=ibmcom
 
 # Image prefix
 PREFIXIMAGE=odm
+
+# Liberty Version
+ FROMLIBERTY=websphere-liberty:webProfile7

decisioncenter/Dockerfile

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

decisionserver/decisionrunner/Dockerfile

@@ -1,3 +1,4 @@
+ARG FROMLIBERTY
 FROM maven:3.5.2-jdk-8-alpine AS builder
 ARG ODMDOCKERDIR
 ENV ODMDOCKERDIR $ODMDOCKERDIR
@@ -32,7 +33,7 @@ RUN $SCRIPT/extractApp.sh DecisionRunner.war
 RUN $SCRIPT/changeParamValue.sh ForceDatabaseTableCreation false true $APPS/DecisionRunner.war/WEB-INF/web.xml
 RUN $SCRIPT/loadFeatures.sh $SCRIPT
 
-FROM websphere-liberty:webProfile7
+FROM ${FROMLIBERTY}
 ARG ODMDOCKERDIR
 ARG ODMVERSION
 LABEL maintainer="ODMDev [email protected], Laurent GRATEAU <[email protected]>"

decisionserver/decisionserverconsole/Dockerfile

@@ -1,3 +1,4 @@
+ARG FROMLIBERTY
 FROM maven:3.5.2-jdk-8-alpine AS builder
 ARG ODMDOCKERDIR
 ENV ODMDOCKERDIR $ODMDOCKERDIR
@@ -32,7 +33,7 @@ RUN $SCRIPT/changeParamValue.sh management.protocol jmx tcpip $APPS/res.war/WEB-
 RUN $SCRIPT/loadFeatures.sh $SCRIPT
 
 
-FROM websphere-liberty:webProfile7
+FROM ${FROMLIBERTY}
 ARG ODMDOCKERDIR
 ARG ODMVERSION
 LABEL maintainer="ODMDev [email protected], Laurent GRATEAU <[email protected]>"

decisionserver/decisionserverruntime/Dockerfile

@@ -1,3 +1,4 @@
+ARG FROMLIBERTY=websphere-liberty:webProfile7
 FROM maven:3.5.2-jdk-8-alpine AS builder
 ARG ODMDOCKERDIR
 ENV ODMDOCKERDIR $ODMDOCKERDIR
@@ -15,7 +16,7 @@ COPY $ODMDOCKERDIR/common/drivers /config/resources
 
 # Use production liberty if needed
 COPY $ODMDOCKERDIR/resources/* /wlp-embeddable/
-RUN chmod a+x $SCRIPT/fixWLPForProduction.sh && sync && $SCRIPT/fixWLPForProduction.sh
+RUN echo "Use the liberty image : $FROMLIBERTY" && chmod a+x $SCRIPT/fixWLPForProduction.sh && sync && $SCRIPT/fixWLPForProduction.sh
 # Install missing require package in the alpine builder image
 RUN apk add --no-cache bash perl ca-certificates wget
 # Build welcome page
@@ -32,7 +33,7 @@ COPY ./executionserver/applicationservers/WLP855/DecisionService.war $APPS
 
 RUN $SCRIPT/extractApp.sh DecisionService.war
 
-FROM websphere-liberty:webProfile7
+FROM ${FROMLIBERTY}
 ARG ODMDOCKERDIR
 ARG ODMVERSION
 ARG DECISIONSERVERCONSOLE_NAME

docker-compose.yml

@@ -1,4 +1,4 @@
-version: '2'
+version: '3'
 services:
   dbserver:
     image: $REPOSITORY/dbserver:$ODMVERSION
@@ -28,6 +28,7 @@ services:
       args:
         - ODMDOCKERDIR=$ODMDOCKERDIR
         - ODMVERSION=$ODMVERSION
+        - FROMLIBERTY=$FROMLIBERTY
     links:
     - dbserver
     depends_on:
@@ -45,6 +46,7 @@ services:
       args:
         - ODMDOCKERDIR=$ODMDOCKERDIR
         - ODMVERSION=$ODMVERSION
+        - FROMLIBERTY=$FROMLIBERTY
     links:
     - dbserver
     - odm-decisionserverconsole
@@ -63,6 +65,7 @@ services:
       args:
         - ODMDOCKERDIR=$ODMDOCKERDIR
         - ODMVERSION=$ODMVERSION
+        - FROMLIBERTY=$FROMLIBERTY
     environment:
       - DECISIONSERVERCONSOLE_NAME=odm-decisionserverconsole
     links:
@@ -83,6 +86,7 @@ services:
       args:
         - ODMDOCKERDIR=$ODMDOCKERDIR
         - ODMVERSION=$ODMVERSION
+        - FROMLIBERTY=$FROMLIBERTY
     links:
     - dbserver
     depends_on: