Code Review
/
sdnc
/
oam.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update base image of dmaap, ueb listeners to java 17
[sdnc/oam.git]
/
installation
/
dmaap-listener
/
src
/
main
/
docker
/
Dockerfile
diff --git
a/installation/dmaap-listener/src/main/docker/Dockerfile
b/installation/dmaap-listener/src/main/docker/Dockerfile
index
df444e0
..
51ae3ad
100644
(file)
--- a/
installation/dmaap-listener/src/main/docker/Dockerfile
+++ b/
installation/dmaap-listener/src/main/docker/Dockerfile
@@
-1,40
+1,30
@@
# Base ubuntu with added packages needed for open ecomp
# Base ubuntu with added packages needed for open ecomp
-FROM alpine:3.8 AS stage0
-
-ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk
+FROM onap/ccsdk-alpine-j17-image:${ccsdk.docker.version} AS stage0
+USER root
ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties
# copy deliverables to opt
COPY opt /opt
ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties
# copy deliverables to opt
COPY opt /opt
+# Remediate log4shell vuln
+RUN apk add zip
+RUN zip -q -d /opt/onap/sdnc/dmaap-listener/lib/log4j-core-*.jar org/apache/logging/log4j/core/lookup/JndiLookup.class
+
# End of stage 0
# End of stage 0
-FROM
alpine:3.8
+FROM
onap/ccsdk-alpine-j17-image:${ccsdk.docker.version}
MAINTAINER SDNC Team (onap-sdnc@lists.onap.org)
MAINTAINER SDNC Team (onap-sdnc@lists.onap.org)
-ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk
ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties
USER root
ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties
USER root
-RUN apk update && apk add \
- bash \
- git \
- openjdk8 \
- maven \
- mysql-client \
- nodejs \
- py-pip \
- graphviz \
- unzip \
- rsync
-
# Create sdnc user
RUN addgroup -S sdnc && adduser -S sdnc -G sdnc
# Create sdnc user
RUN addgroup -S sdnc && adduser -S sdnc -G sdnc
-
# Copy /opt and change owner/group to sdnc
COPY --from=stage0 --chown=sdnc:sdnc /opt /opt
# Copy /opt and change owner/group to sdnc
COPY --from=stage0 --chown=sdnc:sdnc /opt /opt
-USER sdnc
\ No newline at end of file
+
+USER sdnc