#DBACLD-231538 Switch feature maven utility to use artifactory proxy

Author: mmouly

.github/workflows/build-and-test.yml

@@ -1,7 +1,7 @@
 name: Build and test
 on: [push]
 env:
-  DOCKER_COMPOSE_VERSION: 1.29.2
+  DOCKER_COMPOSE_VERSION: v5.1.3
   ODM_FILE_NAME: odm-for-docker.zip
   ODM_VERSION: 8.11.0.1
 jobs:
@@ -24,6 +24,7 @@ jobs:
       - run: bash build.sh
         env:
           ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
+          ARTIFACTORY_TOKEN: ${{ secrets.ARTIFACTORY_PASSWORD }}
           ARTIFACTORY_USER: ${{ secrets.ARTIFACTORY_USER }}
           ODM_URL: ${{ secrets.ODM_URL }}
       - run: sudo docker-compose up -d

decisioncenter/Dockerfile

@@ -50,7 +50,15 @@ ENV ODMDOCKERDIR $ODMDOCKERDIR
 USER root
 ENV SCRIPT /script
 COPY  $ODMDOCKERDIR/common/script $ODMDOCKERDIR/wlp* /opt/wlppackage/
-RUN mkdir $SCRIPT && mv /opt/wlppackage/*.sh $SCRIPT && $SCRIPT/installFeatures.sh
+RUN --mount=type=secret,id=artifactory_user \
+	--mount=type=secret,id=artifactory_token \
+    if [[ -n $(cat /run/secrets/artifactory_user) ]] ; then \
+    mkdir -p /opt/ibm/wlp/etc \
+    && echo "mavenCentralMirror.url=https://na.artifactory.swg-devops.com/artifactory/hyc-decisions-team-proxy-maven-virtual" > /opt/ibm/wlp/etc/featureUtility.properties \
+    && echo "mavenCentralMirror.user=$(cat /run/secrets/artifactory_user)" >> /opt/ibm/wlp/etc/featureUtility.properties \
+    && echo "mavenCentralMirror.password=$(cat /run/secrets/artifactory_token)" >> /opt/ibm/wlp/etc/featureUtility.properties; \
+	fi
+RUN mkdir $SCRIPT && mv /opt/wlppackage/*.sh $SCRIPT && $SCRIPT/installFeatures.sh && rm -f /opt/ibm/wlp/etc/featureUtility.properties
 COPY --chown=1001:0 $ODMDOCKERDIR/decisioncenter/config /config
 COPY --chown=1001:0 $ODMDOCKERDIR/decisioncenter/script $SCRIPT
 COPY --chown=1001:0 $ODMDOCKERDIR/common/config /config

decisionserver/decisionrunner/Dockerfile

@@ -38,7 +38,15 @@ ENV ODMDOCKERDIR $ODMDOCKERDIR
 USER root
 ENV SCRIPT /script
 COPY  $ODMDOCKERDIR/common/script $ODMDOCKERDIR/wlp* /opt/wlppackage/
-RUN mkdir $SCRIPT && mv /opt/wlppackage/*.sh $SCRIPT && $SCRIPT/installFeatures.sh
+RUN --mount=type=secret,id=artifactory_user \
+	--mount=type=secret,id=artifactory_token \
+    if [[ -n $(cat /run/secrets/artifactory_user) ]] ; then \
+    mkdir -p /opt/ibm/wlp/etc \
+    && echo "mavenCentralMirror.url=https://na.artifactory.swg-devops.com/artifactory/hyc-decisions-team-proxy-maven-virtual" > /opt/ibm/wlp/etc/featureUtility.properties \
+    && echo "mavenCentralMirror.user=$(cat /run/secrets/artifactory_user)" >> /opt/ibm/wlp/etc/featureUtility.properties \
+    && echo "mavenCentralMirror.password=$(cat /run/secrets/artifactory_token)" >> /opt/ibm/wlp/etc/featureUtility.properties; \
+	fi
+RUN mkdir $SCRIPT && mv /opt/wlppackage/*.sh $SCRIPT && $SCRIPT/installFeatures.sh && rm -f /opt/ibm/wlp/etc/featureUtility.properties
 COPY --chown=1001:0 $ODMDOCKERDIR/decisionserver/config /config
 COPY --chown=1001:0 $ODMDOCKERDIR/decisionserver/decisionrunner/config /config
 COPY --chown=1001:0 $ODMDOCKERDIR/common/config /config

decisionserver/decisionserverconsole/Dockerfile

@@ -41,7 +41,15 @@ ENV ODMDOCKERDIR $ODMDOCKERDIR
 USER root
 ENV SCRIPT /script
 COPY  $ODMDOCKERDIR/common/script $ODMDOCKERDIR/wlp* /opt/wlppackage/
-RUN mkdir $SCRIPT && mv /opt/wlppackage/*.sh $SCRIPT && $SCRIPT/installFeatures.sh
+RUN --mount=type=secret,id=artifactory_user \
+	--mount=type=secret,id=artifactory_token \
+    if [[ -n $(cat /run/secrets/artifactory_user) ]] ; then \
+    mkdir -p /opt/ibm/wlp/etc \
+    && echo "mavenCentralMirror.url=https://na.artifactory.swg-devops.com/artifactory/hyc-decisions-team-proxy-maven-virtual" > /opt/ibm/wlp/etc/featureUtility.properties \
+    && echo "mavenCentralMirror.user=$(cat /run/secrets/artifactory_user)" >> /opt/ibm/wlp/etc/featureUtility.properties \
+    && echo "mavenCentralMirror.password=$(cat /run/secrets/artifactory_token)" >> /opt/ibm/wlp/etc/featureUtility.properties; \
+	fi
+RUN mkdir $SCRIPT && mv /opt/wlppackage/*.sh $SCRIPT && $SCRIPT/installFeatures.sh && rm -f /opt/ibm/wlp/etc/featureUtility.properties && rm -f /opt/ibm/wlp/etc/featureUtility.properties
 COPY --chown=1001:0 $ODMDOCKERDIR/decisionserver/config /config
 COPY --chown=1001:0 $ODMDOCKERDIR/decisionserver/decisionserverconsole/config /config
 COPY --chown=1001:0 $ODMDOCKERDIR/common/config /config

decisionserver/decisionserverruntime/Dockerfile

@@ -43,7 +43,15 @@ ENV ODMDOCKERDIR $ODMDOCKERDIR
 USER root
 ENV SCRIPT /script
 COPY  $ODMDOCKERDIR/common/script $ODMDOCKERDIR/wlp* /opt/wlppackage/
-RUN mkdir $SCRIPT && mv /opt/wlppackage/*.sh $SCRIPT && $SCRIPT/installFeatures.sh
+RUN --mount=type=secret,id=artifactory_user \
+	--mount=type=secret,id=artifactory_token \
+    if [[ -n $(cat /run/secrets/artifactory_user) ]] ; then \
+    mkdir -p /opt/ibm/wlp/etc \
+    && echo "mavenCentralMirror.url=https://na.artifactory.swg-devops.com/artifactory/hyc-decisions-team-proxy-maven-virtual" > /opt/ibm/wlp/etc/featureUtility.properties \
+    && echo "mavenCentralMirror.user=$(cat /run/secrets/artifactory_user)" >> /opt/ibm/wlp/etc/featureUtility.properties \
+    && echo "mavenCentralMirror.password=$(cat /run/secrets/artifactory_token)" >> /opt/ibm/wlp/etc/featureUtility.properties; \
+	fi
+RUN mkdir $SCRIPT && mv /opt/wlppackage/*.sh $SCRIPT && $SCRIPT/installFeatures.sh && rm -f /opt/ibm/wlp/etc/featureUtility.properties
 COPY --chown=1001:0 $ODMDOCKERDIR/decisionserver/config /config
 COPY --chown=1001:0 $ODMDOCKERDIR/decisionserver/decisionserverruntime/config /config
 COPY --chown=1001:0 $ODMDOCKERDIR/common/config /config

docker-compose.yml

@@ -1,4 +1,8 @@
-version: '3'
+secrets:
+  artifactory_user:
+    environment: ARTIFACTORY_USER
+  artifactory_token:
+    environment: ARTIFACTORY_TOKEN
 services:
   dbserver:
     image: $REPOSITORY/dbserver:$ODMVERSION
@@ -37,6 +41,9 @@ services:
         - FROMLIBERTY=$FROMLIBERTY
         - FROMDOCKERBUILD=$FROMDOCKERBUILD
         - FROMLIBERTYBUILD=$FROMLIBERTY
+      secrets:
+        - artifactory_user
+        - artifactory_token
     links:
     - dbserver
     depends_on:
@@ -57,6 +64,9 @@ services:
         - FROMLIBERTY=$FROMLIBERTY
         - FROMDOCKERBUILD=$FROMDOCKERBUILD
         - FROMLIBERTYBUILD=$FROMLIBERTY
+      secrets:
+        - artifactory_user
+        - artifactory_token
     links:
     - dbserver
     - odm-decisionserverconsole
@@ -78,6 +88,9 @@ services:
         - FROMLIBERTY=$FROMLIBERTY
         - FROMLIBERTYBUILD=$FROMLIBERTY
         - FROMDOCKERBUILD=$FROMDOCKERBUILD
+      secrets:
+        - artifactory_user
+        - artifactory_token
     environment:
       - DECISIONSERVERCONSOLE_NAME=odm-decisionserverconsole
     links:
@@ -102,6 +115,9 @@ services:
         - FROMLIBERTY=$FROMLIBERTY
         - FROMDOCKERBUILD=$FROMDOCKERBUILD
         - FROMLIBERTYBUILD=$FROMLIBERTY
+      secrets:
+        - artifactory_user
+        - artifactory_token
     links:
     - dbserver
     depends_on:

odm-cluster.yml

@@ -1,4 +1,8 @@
-version: '2'
+secrets:
+  artifactory_user:
+    environment: ARTIFACTORY_USER
+  artifactory_token:
+    environment: ARTIFACTORY_TOKEN
 services:
   dbserver:
     image: $REPOSITORY/dbserver:$ODMVERSION
@@ -37,6 +41,9 @@ services:
         - FROMLIBERTY=$FROMLIBERTY
         - FROMDOCKERBUILD=$FROMDOCKERBUILD
         - FROMLIBERTYBUILD=$FROMLIBERTY
+      secrets:
+        - artifactory_user
+        - artifactory_token
     links:
     - dbserver
     environment:
@@ -57,6 +64,9 @@ services:
         - FROMLIBERTY=$FROMLIBERTY
         - FROMDOCKERBUILD=$FROMDOCKERBUILD
         - FROMLIBERTYBUILD=$FROMLIBERTY
+      secrets:
+        - artifactory_user
+        - artifactory_token
     links:
     - dbserver
     - odm-decisionserverconsole
@@ -76,6 +86,9 @@ services:
         - FROMLIBERTY=$FROMLIBERTY
         - FROMDOCKERBUILD=$FROMDOCKERBUILD
         - FROMLIBERTYBUILD=$FROMLIBERTY
+      secrets:
+        - artifactory_user
+        - artifactory_token
     links:
     - dbserver
     - odm-decisionserverconsole
@@ -97,6 +110,9 @@ services:
         - FROMLIBERTY=$FROMLIBERTY
         - FROMDOCKERBUILD=$FROMDOCKERBUILD
         - FROMLIBERTYBUILD=$FROMLIBERTY
+      secrets:
+        - artifactory_user
+        - artifactory_token
     links:
     - dbserver
     depends_on:

odm-standalone.yml

@@ -1,4 +1,8 @@
-version: '2'
+secrets:
+  artifactory_user:
+    environment: ARTIFACTORY_USER
+  artifactory_token:
+    environment: ARTIFACTORY_TOKEN
 services:
   # This following property is defined in the .env file. It's allow to customize your docker images.
   # ODMVERSION : The Operational Decision Management version
@@ -17,6 +21,9 @@ services:
         - FROMLIBERTY=$FROMLIBERTY
         - FROMLIBERTYBUILD=$FROMLIBERTY
         - FROMDOCKERBUILD=$FROMDOCKERBUILD
+      secrets:
+        - artifactory_user
+        - artifactory_token
     user: "1001:0"
     environment:
     - SAMPLE=false

standalone/Dockerfile

@@ -95,10 +95,19 @@ USER root
 ENV SCRIPT /script
 ENV APPS /config/apps
 COPY ${ODMDOCKERDIR}/common/script ${ODMDOCKERDIR}/wlp* /opt/wlppackage/
+RUN --mount=type=secret,id=artifactory_user \
+	--mount=type=secret,id=artifactory_token \
+    if [[ -n $(cat /run/secrets/artifactory_user) ]] ; then \
+    mkdir -p /opt/ibm/wlp/etc \
+    && echo "mavenCentralMirror.url=https://na.artifactory.swg-devops.com/artifactory/hyc-decisions-team-proxy-maven-virtual" > /opt/ibm/wlp/etc/featureUtility.properties \
+    && echo "mavenCentralMirror.user=$(cat /run/secrets/artifactory_user)" >> /opt/ibm/wlp/etc/featureUtility.properties \
+    && echo "mavenCentralMirror.password=$(cat /run/secrets/artifactory_token)" >> /opt/ibm/wlp/etc/featureUtility.properties; \
+	fi
 RUN set -ex; \
     mkdir ${SCRIPT}; \
     mv /opt/wlppackage/*.sh ${SCRIPT}; \
-    $SCRIPT/installFeatures.sh
+    $SCRIPT/installFeatures.sh; \
+    rm -f /opt/ibm/wlp/etc/featureUtility.properties
 
 COPY --chown=1001:0 ${ODMDOCKERDIR}/standalone/licenses $APPS/licenses
 COPY --chown=1001:0 ${ODMDOCKERDIR}/decisioncenter/config/application-*.xml /config/