diff options
| author |   dfarrelly <david.farrelly@est.tech> | 2019-07-24 16:17:13 +0000 |
|---|---|---|
| committer | dfarrelly <david.farrelly@est.tech> | 2019-07-24 16:17:13 +0000 |
| commit | 924a805b71005f56fed260e1b92e4e27ef0a381f (patch) | |
| tree | ebfa129f17b3b5d8cfb6091b9e18fa478d325aa1 /src/main/resources/Dockerfile | |
| parent | 2c8ddf3501cfc5106d20b51ef077cc6d07ab65dc (diff) | |
Align PM Mapper to new build guidelines
*Switch to Fabric8 docker maven plugin
*Add git commit plugin
*Remove shaded jar
*Remove some unused imports
*Add a human readable log file
Issue-ID: DCAEGEN2-1683
Change-Id: I1028f3195d3f03a9d919c91073398b01ccd6d7d1
Signed-off-by: dfarrelly <david.farrelly@est.tech>
Diffstat (limited to 'src/main/resources/Dockerfile')
| -rw-r--r-- | src/main/resources/Dockerfile | 39 |
1 files changed, 29 insertions, 10 deletions
diff --git a/src/main/resources/Dockerfile b/src/main/resources/Dockerfile index 95fdfad..bf59524 100644 --- a/src/main/resources/Dockerfile +++ b/src/main/resources/Dockerfile @@ -19,21 +19,40 @@ # FROM openjdk:8u171-jre-alpine -ENTRYPOINT ["/bin/sh", "-c", "nohup sh etc/reconfigure.sh & /usr/bin/java -jar /opt/app/pm-mapper/pm-mapper.jar"] -ARG JAR WORKDIR /opt/app/pm-mapper RUN apk --no-cache add curl RUN mkdir -p /var/log/ONAP -RUN addgroup -S onap \ - && adduser -S pm-mapper -G onap \ - && chown -R pm-mapper:onap /opt/app/pm-mapper \ - && chmod a+rwx /var/log/ONAP -ADD target/${JAR} /opt/app/pm-mapper/pm-mapper.jar -ADD target/classes/mapping.ftl /opt/app/pm-mapper/etc/mapping.ftl -ADD target/classes/measCollec_plusString.xsd /opt/app/pm-mapper/etc/measCollec_plusString.xsd -ADD target/classes/reconfigure.sh /opt/app/pm-mapper/etc/reconfigure.sh +RUN adduser pm-mapper; \ + chmod a+rwx /var/log/ONAP; \ + chown -R pm-mapper /opt/app/pm-mapper USER pm-mapper + +COPY ${project.build.directory}/${ext.dep.dir.path}/ ${ext.dep.dir.path}/ +COPY ${project.build.directory}/${JAR} . + +COPY ${project.build.directory}/classes/mapping.ftl ./etc/mapping.ftl +COPY ${project.build.directory}/classes/measCollec_plusString.xsd ./etc/measCollec_plusString.xsd +COPY ${project.build.directory}/classes/reconfigure.sh ./etc/reconfigure.sh +COPY --chown=pm-mapper ${project.build.directory}/classes/logback.xml ./etc/logback.xml + + +LABEL git.branch="${git.branch}" \ + git.build.host="${git.build.host}" \ + git.build.time="${git.build.time}" \ + git.build.user.email="${git.build.user.email}" \ + git.build.user.name="${git.build.user.name}" \ + git.build.version="${git.build.version}" \ + git.closest.tag.name="${git.closest.tag.name}" \ + git.commit.id="${git.commit.id}" \ + git.commit.message.short="${git.commit.message.short}" \ + git.commit.time="${git.commit.time}" \ + git.commit.user.email="${git.commit.user.email}" \ + git.commit.user.name="${git.commit.user.name}" + + +ENTRYPOINT ["/bin/sh", "-c", "nohup sh etc/reconfigure.sh & /usr/bin/java -jar ${project.artifactId}-${project.version}.jar"] +ARG JAR |