Code Review
/
dmaap
/
buscontroller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
use ONAP Java 11 image
[dmaap/buscontroller.git]
/
dmaap-bc
/
src
/
main
/
resources
/
Dockerfile
diff --git
a/dmaap-bc/src/main/resources/Dockerfile
b/dmaap-bc/src/main/resources/Dockerfile
index
13ba697
..
64bd689
100644
(file)
--- a/
dmaap-bc/src/main/resources/Dockerfile
+++ b/
dmaap-bc/src/main/resources/Dockerfile
@@
-18,7
+18,7
@@
# limitations under the License.
# ============LICENSE_END====================================================
#
# limitations under the License.
# ============LICENSE_END====================================================
#
-FROM
openjdk:8-jre-alpine
+FROM
library/maven:3.6-jdk-11
MAINTAINER DMAAP Team
MAINTAINER DMAAP Team
@@
-26,17
+26,26
@@
COPY /opt /opt
WORKDIR /opt/app/dmaapbc
WORKDIR /opt/app/dmaapbc
+RUN apt-get update && \
+ apt-get install -y \
+ curl \
+ jq \
+ openssl \
+ net-tools \
+ wget \
+ procps \
+ bash
+
# Install AAF CA certificate
# Install AAF CA certificate
-RUN ap
k update && apk add ca-certificates && rm -rf /var/cache/apk/*
+RUN ap
t install ca-certificates
RUN mkdir -p /usr/local/share/ca-certificates && \
mv misc/aaf-ca.crt /usr/local/share/ca-certificates/aaf-ca.crt
RUN update-ca-certificates
RUN mkdir -p /usr/local/share/ca-certificates && \
mv misc/aaf-ca.crt /usr/local/share/ca-certificates/aaf-ca.crt
RUN update-ca-certificates
-# Install curl
-RUN apk add --no-cache curl
-# Install bash
-RUN apk update && apk add bash
+#prepare certificate location for cadi
+RUN mkdir -p /opt/app/osaaf && \
+ ln -s /opt/app/dmaapbc/etc /opt/app/osaaf/local
RUN mv etc/org.onap.dmaap-bc.jks etc/keystore && \
chmod 600 etc/keystore && \
RUN mv etc/org.onap.dmaap-bc.jks etc/keystore && \
chmod 600 etc/keystore && \
@@
-49,4
+58,10
@@
RUN mv etc/org.onap.dmaap-bc.jks etc/keystore && \
VOLUME /opt/app/dmaapbc/log
VOLUME /opt/app/dmaapbc/log
+RUN addgroup --system -gid 1001 onap \
+ && adduser --ingroup onap --system --disabled-password --no-create-home --uid 1000 dbc \
+ && chown -R dbc:onap /opt/
+
+USER dbc
+
ENTRYPOINT ["sh", "./bin/dmaapbc", "deploy"]
ENTRYPOINT ["sh", "./bin/dmaapbc", "deploy"]