DecisionsDev · mmouly · Mar 22, 2024 · Mar 21, 2024 · Mar 21, 2024 · Mar 21, 2024
diff --git a/.env b/.env
@@ -22,6 +22,8 @@ PREFIXIMAGE=odm
 # Liberty Version
 FROMLIBERTY=ibmcom/websphere-liberty:23.0.0.12-kernel-java17-openj9-ubi
 
+PACKAGELIST="mpMetrics-3.0 openidconnectclient-1.0 collectiveMember-1.0 sessionCache-1.0 ldapRegistry-3.0 localConnector-1.0 mpOpenAPI-2.0 mpOpenTracing-2.0 microProfile-4.0 microProfile-1.0 microProfile-1.2 microProfile-1.3 microProfile-1.4 monitor-1.0 restConnector-1.0 requestTiming-1.0 restConnector-2.0 sessionDatabase-1.0 ssl-1.0 transportSecurity-1.0 webCache-1.0 webProfile-7.0"
+
 # Postgres Version
 FROMPOSTGRES=postgres:15
 POSTGRESUID=999
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -1,7 +1,6 @@
 name: Build and test
 on: [push]
 env:
-  DOCKER_COMPOSE_VERSION: 1.29.2
   ODM_FILE_NAME: odm-for-docker.zip
   ODM_VERSION: 8.12.0.0
 jobs:
@@ -15,17 +14,14 @@ jobs:
         run: echo ${{ secrets.DOCKER_PASSWORD }} | docker login -u ${{ secrets.DOCKER_USER }} --password-stdin
       - run: sudo apt update
       - run: sudo apt full-upgrade
-      - name: Get docker-compose
-        run: sudo curl --insecure --location --output /usr/local/bin/docker-compose --retry 5 --retry-delay 10 https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-$(uname -s)-$(uname -m)
-      - run: docker-compose --version
       - run: docker info
       # - run: sh -c "! egrep -ri '(LICENSE[D]?).*(IBM)' --exclude='*.tar.gz' --exclude=.travis.yml --exclude-dir=licenses --exclude=index.jsp --exclude-dir=.git --exclude-dir=.github --exclude=error.jsp --exclude-dir=dockerhub ."
       - run: bash build.sh
         env:
           ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
           ARTIFACTORY_USER: ${{ secrets.ARTIFACTORY_USER }}
           ODM_URL: ${{ secrets.ODM_URL }}
-      - run: sudo docker-compose up -d
+      - run: sudo docker compose up -d
       - run: sh test/suite.sh
       - name: Report Status by slack
         if: always()

diff --git a/build.sh b/build.sh
@@ -25,20 +25,16 @@ source .env
 echo "Using this properties from .env file."
 cat .env
 docker run --user 'root' -v $PWD/wlp:/opt/wlp  $FROMLIBERTY  /bin/sh -c "mkdir -p /opt/wlp ;\
- installUtility download mpMetrics-3.0 openidconnectclient-1.0 collectiveMember-1.0 sessionCache-1.0 ldapRegistry-3.0 localConnector-1.0 \
-  mpOpenAPI-2.0 mpOpenTracing-2.0 microProfile-4.0 microProfile-1.0 microProfile-1.2 microProfile-1.3 microProfile-1.4 monitor-1.0 restConnector-1.0 \
-  requestTiming-1.0 restConnector-2.0 sessionDatabase-1.0 ssl-1.0 transportSecurity-1.0 webCache-1.0 \
-  webProfile-7.0 webProfile-7.0 --location=/opt/wlp"
-
+ installUtility download $PACKAGELIST --location=/opt/wlp"
 
 echo "build ODM standard docker images..."
-DOCKER_BUILDKIT=1 docker-compose -f docker-compose.yml build
+DOCKER_BUILDKIT=1 docker compose -f docker-compose.yml build
 
 echo "build ODM standalone docker image..."
-DOCKER_BUILDKIT=1 docker-compose -f odm-standalone.yml build
+DOCKER_BUILDKIT=1 docker compose -f odm-standalone.yml build
 
 # echo "build ODM standalone tomcat8 docker image..."
 # docker-compose -f odm-standalone-tomcat.yml build
 
 echo "build ODM cluster docker images..."
-DOCKER_BUILDKIT=1 docker-compose -f odm-cluster.yml build
+DOCKER_BUILDKIT=1 docker compose -f odm-cluster.yml build
diff --git a/common/script/installFeatures.sh b/common/script/installFeatures.sh
@@ -3,9 +3,6 @@
 # Install the driver for Derby
 echo "Install the feature list for ODM on Liberty"
 ROOTFEATUREDIR=/opt/wlppackage
-PACKAGELIST="mpMetrics-3.0 openidconnectclient-1.0 collectiveMember-1.0 sessionCache-1.0 ldapRegistry-3.0 localConnector-1.0 \
-  mpOpenAPI-2.0 mpOpenTracing-2.0 microProfile-4.0 microProfile-1.0 microProfile-1.2 microProfile-1.3 microProfile-1.4 monitor-1.0 restConnector-1.0 \
-  requestTiming-1.0 restConnector-2.0 sessionDatabase-1.0 ssl-1.0 transportSecurity-1.0 webCache-1.0 webProfile-7.0"
 
 if [ ! -d $ROOTFEATUREDIR/features ]; then
   mkdir -p $ROOTFEATUREDIR

diff --git a/decisioncenter/Dockerfile b/decisioncenter/Dockerfile
@@ -45,9 +45,11 @@ FROM ${FROMLIBERTYBUILD} AS oidc-liberty-builder
 ARG ODMDOCKERDIR
 ARG CP4BAVERSION
 ARG ODMVERSION
+ARG PACKAGELIST
 ENV ODMDOCKERDIR $ODMDOCKERDIR
 ENV CP4BAVERSION $CP4BAVERSION
 ENV ODMVERSION $ODMVERSION
+ENV PACKAGELIST $PACKAGELIST
 USER root
 ENV SCRIPT /script
 COPY  $ODMDOCKERDIR/common/script $ODMDOCKERDIR/wlp* /opt/wlppackage/

diff --git a/decisionserver/decisionrunner/Dockerfile b/decisionserver/decisionrunner/Dockerfile
@@ -33,9 +33,11 @@ FROM ${FROMLIBERTYBUILD} AS oidc-liberty-builder
 ARG ODMDOCKERDIR
 ARG CP4BAVERSION
 ARG ODMVERSION
+ARG PACKAGELIST
 ENV ODMDOCKERDIR $ODMDOCKERDIR
 ENV CP4BAVERSION $CP4BAVERSION
 ENV ODMVERSION $ODMVERSION
+ENV PACKAGELIST $PACKAGELIST
 USER root
 ENV SCRIPT /script
 COPY  $ODMDOCKERDIR/common/script $ODMDOCKERDIR/wlp* /opt/wlppackage/

diff --git a/decisionserver/decisionserverconsole/Dockerfile b/decisionserver/decisionserverconsole/Dockerfile
@@ -38,9 +38,11 @@ FROM ${FROMLIBERTYBUILD} AS oidc-liberty-builder
 ARG ODMDOCKERDIR
 ARG CP4BAVERSION
 ARG ODMVERSION
+ARG PACKAGELIST
 ENV ODMDOCKERDIR $ODMDOCKERDIR
 ENV CP4BAVERSION $CP4BAVERSION
 ENV ODMVERSION $ODMVERSION
+ENV PACKAGELIST $PACKAGELIST
 USER root
 ENV SCRIPT /script
 COPY  $ODMDOCKERDIR/common/script $ODMDOCKERDIR/wlp* /opt/wlppackage/

diff --git a/decisionserver/decisionserverruntime/Dockerfile b/decisionserver/decisionserverruntime/Dockerfile
@@ -39,9 +39,11 @@ FROM ${FROMLIBERTYBUILD} AS oidc-liberty-builder
 ARG ODMDOCKERDIR
 ARG CP4BAVERSION
 ARG ODMVERSION
+ARG PACKAGELIST
 ENV ODMDOCKERDIR $ODMDOCKERDIR
 ENV CP4BAVERSION $CP4BAVERSION
 ENV ODMVERSION $ODMVERSION
+ENV PACKAGELIST $PACKAGELIST
 USER root
 ENV SCRIPT /script
 COPY  $ODMDOCKERDIR/common/script $ODMDOCKERDIR/wlp* /opt/wlppackage/

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3'
 services:
   dbserver:
     image: $REPOSITORY/dbserver:$ODMVERSION
@@ -39,6 +38,7 @@ services:
         - FROMLIBERTY=$FROMLIBERTY
         - FROMDOCKERBUILD=$FROMDOCKERBUILD
         - FROMLIBERTYBUILD=$FROMLIBERTY
+        - PACKAGELIST=$PACKAGELIST
     links:
     - dbserver
     depends_on:
@@ -60,6 +60,7 @@ services:
         - FROMLIBERTY=$FROMLIBERTY
         - FROMDOCKERBUILD=$FROMDOCKERBUILD
         - FROMLIBERTYBUILD=$FROMLIBERTY
+        - PACKAGELIST=$PACKAGELIST
     links:
     - dbserver
     - odm-decisionserverconsole
@@ -82,6 +83,7 @@ services:
         - FROMLIBERTY=$FROMLIBERTY
         - FROMLIBERTYBUILD=$FROMLIBERTY
         - FROMDOCKERBUILD=$FROMDOCKERBUILD
+        - PACKAGELIST=$PACKAGELIST
     environment:
       - DECISIONSERVERCONSOLE_NAME=odm-decisionserverconsole
     links:
@@ -107,6 +109,7 @@ services:
         - FROMLIBERTY=$FROMLIBERTY
         - FROMDOCKERBUILD=$FROMDOCKERBUILD
         - FROMLIBERTYBUILD=$FROMLIBERTY
+        - PACKAGELIST=$PACKAGELIST
     links:
     - dbserver
     depends_on:

diff --git a/odm-cluster.yml b/odm-cluster.yml
@@ -37,6 +37,7 @@ services:
         - FROMLIBERTY=$FROMLIBERTY
         - FROMDOCKERBUILD=$FROMDOCKERBUILD
         - FROMLIBERTYBUILD=$FROMLIBERTY
+        - PACKAGELIST=$PACKAGELIST
     links:
     - dbserver
     environment:
@@ -57,6 +58,7 @@ services:
         - FROMLIBERTY=$FROMLIBERTY
         - FROMDOCKERBUILD=$FROMDOCKERBUILD
         - FROMLIBERTYBUILD=$FROMLIBERTY
+        - PACKAGELIST=$PACKAGELIST
     links:
     - dbserver
     - odm-decisionserverconsole
@@ -76,6 +78,7 @@ services:
         - FROMLIBERTY=$FROMLIBERTY
         - FROMDOCKERBUILD=$FROMDOCKERBUILD
         - FROMLIBERTYBUILD=$FROMLIBERTY
+        - PACKAGELIST=$PACKAGELIST
     links:
     - dbserver
     - odm-decisionserverconsole
@@ -97,6 +100,7 @@ services:
         - FROMLIBERTY=$FROMLIBERTY
         - FROMDOCKERBUILD=$FROMDOCKERBUILD
         - FROMLIBERTYBUILD=$FROMLIBERTY
+        - PACKAGELIST=$PACKAGELIST
     links:
     - dbserver
     depends_on:

diff --git a/odm-standalone.yml b/odm-standalone.yml
@@ -17,6 +17,7 @@ services:
         - FROMLIBERTY=$FROMLIBERTY
         - FROMLIBERTYBUILD=$FROMLIBERTY
         - FROMDOCKERBUILD=$FROMDOCKERBUILD
+        - PACKAGELIST=$PACKAGELIST
     user: "1001:0"
     environment:
     - SAMPLE=false

diff --git a/standalone/Dockerfile b/standalone/Dockerfile
@@ -89,7 +89,9 @@ RUN set -ex; \
 
 FROM ${FROMLIBERTYBUILD} AS liberty-builder
 ARG ODMDOCKERDIR
+ARG PACKAGELIST
 ENV ODMDOCKERDIR ${ODMDOCKERDIR}
+ENV PACKAGELIST $PACKAGELIST
 USER root
 ENV SCRIPT /script
 ENV APPS /config/apps