Skip to content

Commit b653717

Browse files
mmoulymmouly
committed
#DBACLD-231538 Switch feature maven utility to use artifactory proxy
1 parent 5faee3d commit b653717

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
@@ -19,6 +19,7 @@ jobs:
1919
- run: bash build.sh
2020
env:
2121
ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
22+
ARTIFACTORY_TOKEN: ${{ secrets.ARTIFACTORY_PASSWORD }}
2223
ARTIFACTORY_USER: ${{ secrets.ARTIFACTORY_USER }}
2324
ODM_URL: ${{ secrets.ODM_URL }}
2425
- run: sudo docker compose up -d

‎decisioncenter/Dockerfile‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,15 @@ ENV PACKAGELIST $PACKAGELIST
5353
USER root
5454
ENV SCRIPT /script
5555
COPY $ODMDOCKERDIR/common/script $ODMDOCKERDIR/wlp* /opt/wlppackage/
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
56+
RUN --mount=type=secret,id=artifactory_user \
57+
--mount=type=secret,id=artifactory_token \
58+
if [[ -n $(cat /run/secrets/artifactory_user) ]] ; then \
59+
mkdir -p /opt/ibm/wlp/etc \
60+
&& echo "mavenCentralMirror.url=https://na.artifactory.swg-devops.com/artifactory/hyc-decisions-team-proxy-maven-virtual" > /opt/ibm/wlp/etc/featureUtility.properties \
61+
&& echo "mavenCentralMirror.user=$(cat /run/secrets/artifactory_user)" >> /opt/ibm/wlp/etc/featureUtility.properties \
62+
&& echo "mavenCentralMirror.password=$(cat /run/secrets/artifactory_token)" >> /opt/ibm/wlp/etc/featureUtility.properties; \
63+
fi
64+
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
5765
COPY --chown=1001:0 $ODMDOCKERDIR/decisioncenter/config /config
5866
COPY --chown=1001:0 $ODMDOCKERDIR/decisioncenter/script $SCRIPT
5967
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
@@ -41,7 +41,15 @@ ENV PACKAGELIST $PACKAGELIST
4141
USER root
4242
ENV SCRIPT /script
4343
COPY $ODMDOCKERDIR/common/script $ODMDOCKERDIR/wlp* /opt/wlppackage/
44-
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
44+
RUN --mount=type=secret,id=artifactory_user \
45+
--mount=type=secret,id=artifactory_token \
46+
if [[ -n $(cat /run/secrets/artifactory_user) ]] ; then \
47+
mkdir -p /opt/ibm/wlp/etc \
48+
&& echo "mavenCentralMirror.url=https://na.artifactory.swg-devops.com/artifactory/hyc-decisions-team-proxy-maven-virtual" > /opt/ibm/wlp/etc/featureUtility.properties \
49+
&& echo "mavenCentralMirror.user=$(cat /run/secrets/artifactory_user)" >> /opt/ibm/wlp/etc/featureUtility.properties \
50+
&& echo "mavenCentralMirror.password=$(cat /run/secrets/artifactory_token)" >> /opt/ibm/wlp/etc/featureUtility.properties; \
51+
fi
52+
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
4553
COPY --chown=1001:0 $ODMDOCKERDIR/decisionserver/config /config
4654
COPY --chown=1001:0 $ODMDOCKERDIR/decisionserver/decisionrunner/config /config
4755
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
@@ -46,7 +46,15 @@ ENV PACKAGELIST $PACKAGELIST
4646
USER root
4747
ENV SCRIPT /script
4848
COPY $ODMDOCKERDIR/common/script $ODMDOCKERDIR/wlp* /opt/wlppackage/
49-
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
49+
RUN --mount=type=secret,id=artifactory_user \
50+
--mount=type=secret,id=artifactory_token \
51+
if [[ -n $(cat /run/secrets/artifactory_user) ]] ; then \
52+
mkdir -p /opt/ibm/wlp/etc \
53+
&& echo "mavenCentralMirror.url=https://na.artifactory.swg-devops.com/artifactory/hyc-decisions-team-proxy-maven-virtual" > /opt/ibm/wlp/etc/featureUtility.properties \
54+
&& echo "mavenCentralMirror.user=$(cat /run/secrets/artifactory_user)" >> /opt/ibm/wlp/etc/featureUtility.properties \
55+
&& echo "mavenCentralMirror.password=$(cat /run/secrets/artifactory_token)" >> /opt/ibm/wlp/etc/featureUtility.properties; \
56+
fi
57+
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
5058
COPY --chown=1001:0 $ODMDOCKERDIR/decisionserver/config /config
5159
COPY --chown=1001:0 $ODMDOCKERDIR/decisionserver/decisionserverconsole/config /config
5260
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
@@ -47,7 +47,15 @@ ENV PACKAGELIST $PACKAGELIST
4747
USER root
4848
ENV SCRIPT /script
4949
COPY $ODMDOCKERDIR/common/script $ODMDOCKERDIR/wlp* /opt/wlppackage/
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
50+
RUN --mount=type=secret,id=artifactory_user \
51+
--mount=type=secret,id=artifactory_token \
52+
if [[ -n $(cat /run/secrets/artifactory_user) ]] ; then \
53+
mkdir -p /opt/ibm/wlp/etc \
54+
&& echo "mavenCentralMirror.url=https://na.artifactory.swg-devops.com/artifactory/hyc-decisions-team-proxy-maven-virtual" > /opt/ibm/wlp/etc/featureUtility.properties \
55+
&& echo "mavenCentralMirror.user=$(cat /run/secrets/artifactory_user)" >> /opt/ibm/wlp/etc/featureUtility.properties \
56+
&& echo "mavenCentralMirror.password=$(cat /run/secrets/artifactory_token)" >> /opt/ibm/wlp/etc/featureUtility.properties; \
57+
fi
58+
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
5159
COPY --chown=1001:0 $ODMDOCKERDIR/decisionserver/config /config
5260
COPY --chown=1001:0 $ODMDOCKERDIR/decisionserver/decisionserverruntime/config /config
5361
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,3 +1,8 @@
1+
secrets:
2+
artifactory_user:
3+
environment: ARTIFACTORY_USER
4+
artifactory_token:
5+
environment: ARTIFACTORY_TOKEN
16
services:
27
dbserver:
38
image: $REPOSITORY/dbserver:$ODMVERSION
@@ -39,6 +44,9 @@ services:
3944
- FROMDOCKERBUILD=$FROMDOCKERBUILD
4045
- FROMLIBERTYBUILD=$FROMLIBERTY
4146
- PACKAGELIST=$PACKAGELIST
47+
secrets:
48+
- artifactory_user
49+
- artifactory_token
4250
links:
4351
- dbserver
4452
depends_on:
@@ -61,6 +69,9 @@ services:
6169
- FROMDOCKERBUILD=$FROMDOCKERBUILD
6270
- FROMLIBERTYBUILD=$FROMLIBERTY
6371
- PACKAGELIST=$PACKAGELIST
72+
secrets:
73+
- artifactory_user
74+
- artifactory_token
6475
links:
6576
- dbserver
6677
- odm-decisionserverconsole
@@ -84,6 +95,9 @@ services:
8495
- FROMLIBERTYBUILD=$FROMLIBERTY
8596
- FROMDOCKERBUILD=$FROMDOCKERBUILD
8697
- PACKAGELIST=$PACKAGELIST
98+
secrets:
99+
- artifactory_user
100+
- artifactory_token
87101
environment:
88102
- DECISIONSERVERCONSOLE_NAME=odm-decisionserverconsole
89103
links:
@@ -110,6 +124,9 @@ services:
110124
- FROMDOCKERBUILD=$FROMDOCKERBUILD
111125
- FROMLIBERTYBUILD=$FROMLIBERTY
112126
- PACKAGELIST=$PACKAGELIST
127+
secrets:
128+
- artifactory_user
129+
- artifactory_token
113130
links:
114131
- dbserver
115132
depends_on:

0 commit comments

Comments
 (0)