Change openjdk baseOS img to integration-java11

[dcaegen2/collectors/hv-ves.git] / sources / hv-collector-main / Dockerfile

diff --git a/sources/hv-collector-main/Dockerfile b/sources/hv-collector-main/Dockerfile
index 178045c..5f2dda7 100644 (file)
--- a/sources/hv-collector-main/Dockerfile
+++ b/sources/hv-collector-main/Dockerfile
@@ -1,31 +1,33 @@
-FROM docker.io/openjdk:11-jre-slim
+FROM nexus3.onap.org:10001/onap/integration-java11:8.0.0
 
-LABEL copyright="Copyright (C) 2018-2019 NOKIA"
-LABEL license.name="The Apache Software License, Version 2.0"
-LABEL license.url="http://www.apache.org/licenses/LICENSE-2.0"
-LABEL maintainer="Nokia Wroclaw ONAP Team"
+LABEL copyright="Copyright (C) 2018-2019 NOKIA" \
+      license.name="The Apache Software License, Version 2.0" \
+      license.url="http://www.apache.org/licenses/LICENSE-2.0" \
+      maintainer="Nokia Wroclaw ONAP Team"
 
 ARG HV_VES_USER=hvves
+ARG HV_VES_GROUP=hvves
 ARG HV_VES_USER_ID_NUMBER=1410
 
-RUN apt-get update \
-        && apt-get install -y --no-install-recommends curl netcat \
-        && apt-get clean
+USER root
+RUN apk add --no-cache curl netcat-openbsd
+RUN addgroup $HV_VES_GROUP && adduser --system --disabled-password \
+    --no-create-home --uid ${HV_VES_USER_ID_NUMBER} --ingroup $HV_VES_GROUP $HV_VES_USER && \
+    mkdir -p /etc/ves-hv/ssl && \
+    mkdir -p /var/log/ONAP/dcae-hv-ves-collector/ && \
+    chown -R ${HV_VES_USER}:${HV_VES_GROUP} /etc/ves-hv /var/log/ONAP/ /opt && \
+    chmod g+s /opt /etc/ves-hv
 
 WORKDIR /opt/ves-hv-collector
 
-RUN useradd --user-group --uid ${HV_VES_USER_ID_NUMBER} ${HV_VES_USER}
-
-RUN mkdir -p /etc/ves-hv/ssl && chown -R ${HV_VES_USER} /etc/ves-hv/ssl
+COPY --chown=${HV_VES_USER}:${HV_VES_GROUP} target/libs/external/* ./
+COPY --chown=${HV_VES_USER}:${HV_VES_GROUP} target/libs/internal/* ./
+COPY --chown=${HV_VES_USER}:${HV_VES_GROUP} src/main/docker/*.sh ./
+COPY --chown=${HV_VES_USER}:${HV_VES_GROUP} src/main/docker/base.json /etc/ves-hv/configuration/base.json
+COPY --chown=${HV_VES_USER}:${HV_VES_GROUP} target/hv-collector-main-*.jar ./
 
 USER ${HV_VES_USER}
 
 ENTRYPOINT ["./entry.sh"]
 CMD ["--configuration-file /etc/ves-hv/configuration/base.json"]
 
-COPY target/libs/external/* ./
-COPY target/libs/internal/* ./
-COPY src/main/docker/*.sh ./
-COPY src/main/docker/base.json /etc/ves-hv/configuration/base.json
-
-COPY target/hv-collector-main-*.jar ./
\ No newline at end of file