summaryrefslogtreecommitdiffstats
path: root/installation
diff options
context:
space:
mode:
authorSingal, Kapil (ks220y) <ks220y@att.com>2021-07-12 11:42:45 -0400
committerKAPIL SINGAL <ks220y@att.com>2021-07-14 17:06:05 +0000
commit3f0cf04efd86ee181e2358488390b408a2e1b4d3 (patch)
tree65a1de312aab4de6a435b1c645072a007bb2a75e /installation
parent7d07a84694cb4f7b0153b141fe2f7f2850557f78 (diff)
Short Term fix for javax.servlet-api
Fixing run-csit.sh script Commenting out few sdnc_csit.robot tests for short term Issue-ID: SDNC-1581 Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com> Change-Id: I0a4941519eff4e774d77a59dcf3da3da457356e5 Former-commit-id: de3e2550b9b63e49d2813e6b3d94cb0a1a33c791
Diffstat (limited to 'installation')
-rwxr-xr-xinstallation/sdnc/src/main/docker/Dockerfile22
1 files changed, 13 insertions, 9 deletions
diff --git a/installation/sdnc/src/main/docker/Dockerfile b/installation/sdnc/src/main/docker/Dockerfile
index 05d68fce..7bb3d23a 100755
--- a/installation/sdnc/src/main/docker/Dockerfile
+++ b/installation/sdnc/src/main/docker/Dockerfile
@@ -56,6 +56,10 @@ RUN echo org.ops4j.pax.web.ssl.keypassword=$SDNC_KEYPASS >> $ODL_HOME/etc/custom
# Overwrite svclogic compiler properties
RUN cp /opt/onap/sdnc/data/properties/svclogic-compiler.properties /opt/onap/sdnc/svclogic/config/svclogic.properties
+# Short term fix starts: for javax.servlet-api bundle (Replacing 4.0.1 to 3.1.0 as it's unique for javax.servlet-api)
+RUN find /opt/opendaylight -name "*features*.xml" -exec sed -i -e 's|4.0.1|3.1.0|g' {} \;
+# Short term fix ends
+
# Changing ownership and permission of /opt
RUN chown -R odl:odl /opt && chmod -R 755 /opt
@@ -68,18 +72,18 @@ FROM scratch
LABEL maintainer="SDN-C Team (sdnc@lists.onap.org)"
USER root
-ENV LC_ALL en_US.UTF-8
-ENV JAVA_HOME /opt/java/openjdk
-ENV PATH $PATH:/opt/java/openjdk/bin
-
-ENV ODL_HOME /opt/opendaylight/current
-ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties
-ENV SDNC_KEYSTORE ${sdnc.keystore}
-ENV SDNC_KEYPASS ${sdnc.keypass}
+ENV LC_ALL=en_US.UTF-8 \
+ JAVA_HOME=/opt/java/openjdk \
+ PATH=$PATH:/opt/java/openjdk/bin \
+ ODL_HOME=/opt/opendaylight/current \
+ SDNC_CONFIG_DIR=/opt/onap/sdnc/data/properties \
+ SDNC_KEYSTORE=${sdnc.keystore} \
+ SDNC_KEYPASS=${sdnc.keypass}
# Copy Everything from stage0
COPY --from=stage0 / /
USER odl
-ENTRYPOINT /opt/onap/sdnc/bin/startODL.sh
EXPOSE 8181
+WORKDIR ${ODL_HOME}
+ENTRYPOINT /opt/onap/sdnc/bin/startODL.sh