Skip to content

Commit b9fe982

Browse files
mmoulymmouly
committed
#DBACLD-231538 Switch feature maven utility to use artifactory proxy
1 parent 65ed6a2 commit b9fe982

9 files changed

Lines changed: 89 additions & 8 deletions

File tree

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ jobs:
2323
- run: bash build.sh
2424
env:
2525
ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
26+
ARTIFACTORY_TOKEN: ${{ secrets.ARTIFACTORY_PASSWORD }}
2627
ARTIFACTORY_USER: ${{ secrets.ARTIFACTORY_USER }}
2728
ODM_URL: ${{ secrets.ODM_URL }}
2829
- run: sudo docker-compose up -d

‎decisioncenter/Dockerfile‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,15 @@ ENV ODMVERSION $ODMVERSION
5151
USER root
5252
ENV SCRIPT /script
5353
COPY $ODMDOCKERDIR/common/script $ODMDOCKERDIR/wlp* /opt/wlppackage/
54-
RUN mkdir $SCRIPT && mv /opt/wlppackage/*.sh $SCRIPT && $SCRIPT/installFeatures.sh && chmod a+x $SCRIPT/*.sh && touch /opt/ibm/wlp/usr/servers/defaultServer/keystore.xml
54+
RUN --mount=type=secret,id=artifactory_user \
55+
--mount=type=secret,id=artifactory_token \
56+
if [[ -n $(cat /run/secrets/artifactory_user) ]] ; then \
57+
mkdir -p /opt/ibm/wlp/etc \
58+
&& echo "mavenCentralMirror.url=https://na.artifactory.swg-devops.com/artifactory/hyc-decisions-team-proxy-maven-virtual" > /opt/ibm/wlp/etc/featureUtility.properties \
59+
&& echo "mavenCentralMirror.user=$(cat /run/secrets/artifactory_user)" >> /opt/ibm/wlp/etc/featureUtility.properties \
60+
&& echo "mavenCentralMirror.password=$(cat /run/secrets/artifactory_token)" >> /opt/ibm/wlp/etc/featureUtility.properties; \
61+
fi
62+
RUN mkdir $SCRIPT && mv /opt/wlppackage/*.sh $SCRIPT && $SCRIPT/installFeatures.sh && chmod a+x $SCRIPT/*.sh && touch /opt/ibm/wlp/usr/servers/defaultServer/keystore.xml && rm -f /opt/ibm/wlp/etc/featureUtility.properties
5563
COPY --chown=1001:0 $ODMDOCKERDIR/decisioncenter/config /config
5664
COPY --chown=1001:0 $ODMDOCKERDIR/decisioncenter/script $SCRIPT
5765
COPY --chown=1001:0 $ODMDOCKERDIR/common/config /config

‎decisionserver/decisionrunner/Dockerfile‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,15 @@ ENV ODMVERSION $ODMVERSION
3939
USER root
4040
ENV SCRIPT /script
4141
COPY $ODMDOCKERDIR/common/script $ODMDOCKERDIR/wlp* /opt/wlppackage/
42-
RUN mkdir $SCRIPT && mv /opt/wlppackage/*.sh $SCRIPT && $SCRIPT/installFeatures.sh && chmod a+x $SCRIPT/*.sh && touch /opt/ibm/wlp/usr/servers/defaultServer/keystore.xml
42+
RUN --mount=type=secret,id=artifactory_user \
43+
--mount=type=secret,id=artifactory_token \
44+
if [[ -n $(cat /run/secrets/artifactory_user) ]] ; then \
45+
mkdir -p /opt/ibm/wlp/etc \
46+
&& echo "mavenCentralMirror.url=https://na.artifactory.swg-devops.com/artifactory/hyc-decisions-team-proxy-maven-virtual" > /opt/ibm/wlp/etc/featureUtility.properties \
47+
&& echo "mavenCentralMirror.user=$(cat /run/secrets/artifactory_user)" >> /opt/ibm/wlp/etc/featureUtility.properties \
48+
&& echo "mavenCentralMirror.password=$(cat /run/secrets/artifactory_token)" >> /opt/ibm/wlp/etc/featureUtility.properties; \
49+
fi
50+
RUN mkdir $SCRIPT && mv /opt/wlppackage/*.sh $SCRIPT && $SCRIPT/installFeatures.sh && chmod a+x $SCRIPT/*.sh && touch /opt/ibm/wlp/usr/servers/defaultServer/keystore.xml && rm -f /opt/ibm/wlp/etc/featureUtility.properties
4351
COPY --chown=1001:0 $ODMDOCKERDIR/decisionserver/config /config
4452
COPY --chown=1001:0 $ODMDOCKERDIR/decisionserver/decisionrunner/config /config
4553
COPY --chown=1001:0 $ODMDOCKERDIR/common/config /config

‎decisionserver/decisionserverconsole/Dockerfile‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,15 @@ ENV ODMVERSION $ODMVERSION
4343
USER root
4444
ENV SCRIPT /script
4545
COPY $ODMDOCKERDIR/common/script $ODMDOCKERDIR/wlp* /opt/wlppackage/
46-
RUN mkdir $SCRIPT && mv /opt/wlppackage/*.sh $SCRIPT && $SCRIPT/installFeatures.sh && chmod a+x $SCRIPT/*.sh && touch /opt/ibm/wlp/usr/servers/defaultServer/keystore.xml
46+
RUN --mount=type=secret,id=artifactory_user \
47+
--mount=type=secret,id=artifactory_token \
48+
if [[ -n $(cat /run/secrets/artifactory_user) ]] ; then \
49+
mkdir -p /opt/ibm/wlp/etc \
50+
&& echo "mavenCentralMirror.url=https://na.artifactory.swg-devops.com/artifactory/hyc-decisions-team-proxy-maven-virtual" > /opt/ibm/wlp/etc/featureUtility.properties \
51+
&& echo "mavenCentralMirror.user=$(cat /run/secrets/artifactory_user)" >> /opt/ibm/wlp/etc/featureUtility.properties \
52+
&& echo "mavenCentralMirror.password=$(cat /run/secrets/artifactory_token)" >> /opt/ibm/wlp/etc/featureUtility.properties; \
53+
fi
54+
RUN mkdir $SCRIPT && mv /opt/wlppackage/*.sh $SCRIPT && $SCRIPT/installFeatures.sh && chmod a+x $SCRIPT/*.sh && touch /opt/ibm/wlp/usr/servers/defaultServer/keystore.xml && rm -f /opt/ibm/wlp/etc/featureUtility.properties
4755
COPY --chown=1001:0 $ODMDOCKERDIR/decisionserver/config /config
4856
COPY --chown=1001:0 $ODMDOCKERDIR/decisionserver/decisionserverconsole/config /config
4957
COPY --chown=1001:0 $ODMDOCKERDIR/common/config /config

‎decisionserver/decisionserverruntime/Dockerfile‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,15 @@ ENV ODMVERSION $ODMVERSION
4545
USER root
4646
ENV SCRIPT /script
4747
COPY $ODMDOCKERDIR/common/script $ODMDOCKERDIR/wlp* /opt/wlppackage/
48-
RUN mkdir $SCRIPT && mv /opt/wlppackage/*.sh $SCRIPT && $SCRIPT/installFeatures.sh && chmod a+x $SCRIPT/*.sh && touch /opt/ibm/wlp/usr/servers/defaultServer/keystore.xml
48+
RUN --mount=type=secret,id=artifactory_user \
49+
--mount=type=secret,id=artifactory_token \
50+
if [[ -n $(cat /run/secrets/artifactory_user) ]] ; then \
51+
mkdir -p /opt/ibm/wlp/etc \
52+
&& echo "mavenCentralMirror.url=https://na.artifactory.swg-devops.com/artifactory/hyc-decisions-team-proxy-maven-virtual" > /opt/ibm/wlp/etc/featureUtility.properties \
53+
&& echo "mavenCentralMirror.user=$(cat /run/secrets/artifactory_user)" >> /opt/ibm/wlp/etc/featureUtility.properties \
54+
&& echo "mavenCentralMirror.password=$(cat /run/secrets/artifactory_token)" >> /opt/ibm/wlp/etc/featureUtility.properties; \
55+
fi
56+
RUN mkdir $SCRIPT && mv /opt/wlppackage/*.sh $SCRIPT && $SCRIPT/installFeatures.sh && chmod a+x $SCRIPT/*.sh && touch /opt/ibm/wlp/usr/servers/defaultServer/keystore.xml && rm -f /opt/ibm/wlp/etc/featureUtility.properties
4957
COPY --chown=1001:0 $ODMDOCKERDIR/decisionserver/config /config
5058
COPY --chown=1001:0 $ODMDOCKERDIR/decisionserver/decisionserverruntime/config /config
5159
COPY --chown=1001:0 $ODMDOCKERDIR/common/config /config

‎docker-compose.yml‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
version: '3'
1+
secrets:
2+
artifactory_user:
3+
environment: ARTIFACTORY_USER
4+
artifactory_token:
5+
environment: ARTIFACTORY_TOKEN
26
services:
37
dbserver:
48
image: $REPOSITORY/dbserver:$ODMVERSION
@@ -39,6 +43,9 @@ services:
3943
- FROMLIBERTY=$FROMLIBERTY
4044
- FROMDOCKERBUILD=$FROMDOCKERBUILD
4145
- FROMLIBERTYBUILD=$FROMLIBERTY
46+
secrets:
47+
- artifactory_user
48+
- artifactory_token
4249
links:
4350
- dbserver
4451
depends_on:
@@ -60,6 +67,9 @@ services:
6067
- FROMLIBERTY=$FROMLIBERTY
6168
- FROMDOCKERBUILD=$FROMDOCKERBUILD
6269
- FROMLIBERTYBUILD=$FROMLIBERTY
70+
secrets:
71+
- artifactory_user
72+
- artifactory_token
6373
links:
6474
- dbserver
6575
- odm-decisionserverconsole
@@ -82,6 +92,9 @@ services:
8292
- FROMLIBERTY=$FROMLIBERTY
8393
- FROMLIBERTYBUILD=$FROMLIBERTY
8494
- FROMDOCKERBUILD=$FROMDOCKERBUILD
95+
secrets:
96+
- artifactory_user
97+
- artifactory_token
8598
environment:
8699
- DECISIONSERVERCONSOLE_NAME=odm-decisionserverconsole
87100
links:
@@ -107,6 +120,9 @@ services:
107120
- FROMLIBERTY=$FROMLIBERTY
108121
- FROMDOCKERBUILD=$FROMDOCKERBUILD
109122
- FROMLIBERTYBUILD=$FROMLIBERTY
123+
secrets:
124+
- artifactory_user
125+
- artifactory_token
110126
links:
111127
- dbserver
112128
depends_on:

‎odm-cluster.yml‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
version: '2'
1+
secrets:
2+
artifactory_user:
3+
environment: ARTIFACTORY_USER
4+
artifactory_token:
5+
environment: ARTIFACTORY_TOKEN
26
services:
37
dbserver:
48
image: $REPOSITORY/dbserver:$ODMVERSION
@@ -37,6 +41,9 @@ services:
3741
- FROMLIBERTY=$FROMLIBERTY
3842
- FROMDOCKERBUILD=$FROMDOCKERBUILD
3943
- FROMLIBERTYBUILD=$FROMLIBERTY
44+
secrets:
45+
- artifactory_user
46+
- artifactory_token
4047
links:
4148
- dbserver
4249
environment:
@@ -57,6 +64,9 @@ services:
5764
- FROMLIBERTY=$FROMLIBERTY
5865
- FROMDOCKERBUILD=$FROMDOCKERBUILD
5966
- FROMLIBERTYBUILD=$FROMLIBERTY
67+
secrets:
68+
- artifactory_user
69+
- artifactory_token
6070
links:
6171
- dbserver
6272
- odm-decisionserverconsole
@@ -76,6 +86,9 @@ services:
7686
- FROMLIBERTY=$FROMLIBERTY
7787
- FROMDOCKERBUILD=$FROMDOCKERBUILD
7888
- FROMLIBERTYBUILD=$FROMLIBERTY
89+
secrets:
90+
- artifactory_user
91+
- artifactory_token
7992
links:
8093
- dbserver
8194
- odm-decisionserverconsole
@@ -97,6 +110,9 @@ services:
97110
- FROMLIBERTY=$FROMLIBERTY
98111
- FROMDOCKERBUILD=$FROMDOCKERBUILD
99112
- FROMLIBERTYBUILD=$FROMLIBERTY
113+
secrets:
114+
- artifactory_user
115+
- artifactory_token
100116
links:
101117
- dbserver
102118
depends_on:

‎odm-standalone.yml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
version: '2'
1+
secrets:
2+
artifactory_user:
3+
environment: ARTIFACTORY_USER
4+
artifactory_token:
5+
environment: ARTIFACTORY_TOKEN
26
services:
37
# This following property is defined in the .env file. It's allow to customize your docker images.
48
# ODMVERSION : The Operational Decision Management version
@@ -17,6 +21,9 @@ services:
1721
- FROMLIBERTY=$FROMLIBERTY
1822
- FROMLIBERTYBUILD=$FROMLIBERTY
1923
- FROMDOCKERBUILD=$FROMDOCKERBUILD
24+
secrets:
25+
- artifactory_user
26+
- artifactory_token
2027
user: "1001:0"
2128
environment:
2229
- SAMPLE=false

‎standalone/Dockerfile‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,19 @@ USER root
9595
ENV SCRIPT /script
9696
ENV APPS /config/apps
9797
COPY ${ODMDOCKERDIR}/common/script ${ODMDOCKERDIR}/wlp* /opt/wlppackage/
98+
RUN --mount=type=secret,id=artifactory_user \
99+
--mount=type=secret,id=artifactory_token \
100+
if [[ -n $(cat /run/secrets/artifactory_user) ]] ; then \
101+
mkdir -p /opt/ibm/wlp/etc \
102+
&& echo "mavenCentralMirror.url=https://na.artifactory.swg-devops.com/artifactory/hyc-decisions-team-proxy-maven-virtual" > /opt/ibm/wlp/etc/featureUtility.properties \
103+
&& echo "mavenCentralMirror.user=$(cat /run/secrets/artifactory_user)" >> /opt/ibm/wlp/etc/featureUtility.properties \
104+
&& echo "mavenCentralMirror.password=$(cat /run/secrets/artifactory_token)" >> /opt/ibm/wlp/etc/featureUtility.properties; \
105+
fi
98106
RUN set -ex; \
99107
mkdir ${SCRIPT}; \
100108
mv /opt/wlppackage/*.sh ${SCRIPT}; \
101-
$SCRIPT/installFeatures.sh
109+
$SCRIPT/installFeatures.sh; \
110+
rm -f /opt/ibm/wlp/etc/featureUtility.properties
102111

103112
COPY --chown=1001:0 ${ODMDOCKERDIR}/standalone/licenses $APPS/licenses
104113
COPY --chown=1001:0 ${ODMDOCKERDIR}/decisioncenter/config/application-*.xml /config/

0 commit comments

Comments
 (0)