Skip to content

Commit 80a12a7

Browse files
mmoulymmouly
committed
#DBACLD-231538 Switch feature maven utility to use artifactory proxy
1 parent 551806f commit 80a12a7

6 files changed

Lines changed: 54 additions & 4 deletions

File tree

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ jobs:
2424
- run: bash build.sh
2525
env:
2626
ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
27+
ARTIFACTORY_TOKEN: ${{ secrets.ARTIFACTORY_PASSWORD }}
2728
ARTIFACTORY_USER: ${{ secrets.ARTIFACTORY_USER }}
2829
ODM_URL: ${{ secrets.ODM_URL }}
2930
- 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 & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
version: '3'
2+
secrets:
3+
artifactory_user:
4+
environment: ARTIFACTORY_USER
5+
artifactory_token:
6+
environment: ARTIFACTORY_TOKEN
27
services:
38
dbserver:
49
image: $REPOSITORY/dbserver:$ODMVERSION
@@ -39,6 +44,9 @@ services:
3944
- FROMLIBERTY=$FROMLIBERTY
4045
- FROMDOCKERBUILD=$FROMDOCKERBUILD
4146
- FROMLIBERTYBUILD=$FROMLIBERTY
47+
secrets:
48+
- artifactory_user
49+
- artifactory_token
4250
links:
4351
- dbserver
4452
depends_on:
@@ -60,6 +68,9 @@ services:
6068
- FROMLIBERTY=$FROMLIBERTY
6169
- FROMDOCKERBUILD=$FROMDOCKERBUILD
6270
- FROMLIBERTYBUILD=$FROMLIBERTY
71+
secrets:
72+
- artifactory_user
73+
- artifactory_token
6374
links:
6475
- dbserver
6576
- odm-decisionserverconsole
@@ -82,6 +93,9 @@ services:
8293
- FROMLIBERTY=$FROMLIBERTY
8394
- FROMLIBERTYBUILD=$FROMLIBERTY
8495
- FROMDOCKERBUILD=$FROMDOCKERBUILD
96+
secrets:
97+
- artifactory_user
98+
- artifactory_token
8599
environment:
86100
- DECISIONSERVERCONSOLE_NAME=odm-decisionserverconsole
87101
links:
@@ -107,6 +121,9 @@ services:
107121
- FROMLIBERTY=$FROMLIBERTY
108122
- FROMDOCKERBUILD=$FROMDOCKERBUILD
109123
- FROMLIBERTYBUILD=$FROMLIBERTY
124+
secrets:
125+
- artifactory_user
126+
- artifactory_token
110127
links:
111128
- dbserver
112129
depends_on:

0 commit comments

Comments
 (0)