summaryrefslogtreecommitdiffstats
path: root/sdc-workflow-designer-be
diff options
context:
space:
mode:
authorxuegao <xg353y@intl.att.com>2020-09-18 10:22:19 +0200
committerxuegao <xg353y@intl.att.com>2020-09-18 10:26:07 +0200
commitc51038a7891b493d84e102ab997099a8061d8641 (patch)
tree1f56c59481d5bfae28dd3d531403d8e492ab3092 /sdc-workflow-designer-be
parent19e4d22e0bc16f89197d96bc5c237d1c4247efbf (diff)
Upgrade to java 111.7.0
Update WFD from java 8 to java 11. Issue-ID: SDC-3283 Change-Id: I7d87779d33771e572a98a60c663e192b2be7eaa1 Signed-off-by: xuegao <xg353y@intl.att.com>
Diffstat (limited to 'sdc-workflow-designer-be')
-rw-r--r--sdc-workflow-designer-be/docker/Dockerfile18
-rw-r--r--sdc-workflow-designer-be/pom.xml6
2 files changed, 14 insertions, 10 deletions
diff --git a/sdc-workflow-designer-be/docker/Dockerfile b/sdc-workflow-designer-be/docker/Dockerfile
index 91a5e78b..1aaf4b69 100644
--- a/sdc-workflow-designer-be/docker/Dockerfile
+++ b/sdc-workflow-designer-be/docker/Dockerfile
@@ -1,22 +1,20 @@
-FROM openjdk:8-jdk-alpine
+FROM onap/integration-java11:7.1.0
EXPOSE 8080
-USER root
-RUN addgroup -g 1000 sdc && adduser -S -u 1000 -G sdc -s /bin/sh sdc
-
+USER root
ARG ARTIFACT
-ADD --chown=sdc:sdc ${ARTIFACT} /app.jar
+ADD --chown=onap:onap ${ARTIFACT} /app.jar
-COPY --chown=sdc:sdc org.onap.sdc.p12 /keystore
-COPY --chown=sdc:sdc org.onap.sdc.trust.jks /truststore
+COPY --chown=onap:onap org.onap.sdc.p12 /keystore
+COPY --chown=onap:onap org.onap.sdc.trust.jks /truststore
-COPY --chown=sdc:sdc startup.sh .
+COPY --chown=onap:onap startup.sh .
RUN chmod 744 startup.sh
RUN mkdir /var/log/ONAP/
-RUN chown sdc:sdc /var/log/ONAP/
+RUN chown onap:onap /var/log/ONAP/
-USER sdc
+USER onap
ENTRYPOINT [ "./startup.sh" ]
diff --git a/sdc-workflow-designer-be/pom.xml b/sdc-workflow-designer-be/pom.xml
index c06314e0..a3fdf903 100644
--- a/sdc-workflow-designer-be/pom.xml
+++ b/sdc-workflow-designer-be/pom.xml
@@ -18,6 +18,7 @@
<mapstruct.version>1.3.1.Final</mapstruct.version>
<lombok.version>1.18.0</lombok.version>
<springfox.version>2.8.0</springfox.version>
+ <jaxb.api.version>2.3.0</jaxb.api.version>
</properties>
<dependencyManagement>
@@ -160,6 +161,11 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb.api.version}</version>
+ </dependency>
</dependencies>
<build>