diff options
| author |   Tony Hansen <tony@att.com> | 2019-02-27 00:23:06 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-02-27 00:23:06 +0000 |
| commit | 791165faf645ae4d149c0f9493b4e28bab44355f (patch) | |
| tree | a746184c4ee0e750eef016a7ec01310851054790 | |
| parent | f7e07b1bfda9ffe612b1339e4b95394448c700f4 (diff) | |
| parent | 2d336f92193423a1c9a542ca7dc0819fb5b5f3a9 (diff) | |
Merge "Update docker image"
| -rw-r--r-- | pom.xml | 12 | ||||
| -rw-r--r-- | src/main/resources/Dockerfile | 12 |
2 files changed, 18 insertions, 6 deletions
@@ -20,13 +20,13 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>org.onap.dcaegen2.services</groupId> <artifactId>pm-mapper</artifactId> - <version>1.0-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <parent> <groupId>org.onap.oparent</groupId> @@ -62,6 +62,8 @@ <surefire.version>2.22.0</surefire.version> <!-- Plugin Settings --> <image-name>${docker.push.registry}/onap/${project.groupId}.${project.artifactId}</image-name> + <maven.build.timestamp.format>yyyymmdd'T'hhmmss'Z'</maven.build.timestamp.format> + <timestamp>${maven.build.timestamp}</timestamp> <sonar.language>java</sonar.language> <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin> <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath> @@ -194,7 +196,7 @@ <version>${dockerfile.version}</version> <configuration> <repository>${image-name}</repository> - <tag>${project.version}</tag> + <tag>${project.version}-${timestamp}</tag> <dockerfile>${project.build.outputDirectory}/Dockerfile</dockerfile> <buildArgs> <JAR>${project.build.finalName}-jar-with-dependencies.jar</JAR> @@ -228,7 +230,7 @@ <shadedClassifierName>jar-with-dependencies</shadedClassifierName> <transformers> <transformer - implementation="${shade.transformer}"> + implementation="${shade.transformer}"> <mainClass>${shade.main}</mainClass> </transformer> </transformers> diff --git a/src/main/resources/Dockerfile b/src/main/resources/Dockerfile index 9ceba29..e2b6b89 100644 --- a/src/main/resources/Dockerfile +++ b/src/main/resources/Dockerfile @@ -17,10 +17,20 @@ # SPDX-License-Identifier: Apache-2.0 # ============LICENSE_END========================================================= # -FROM openjdk:8-jre +FROM openjdk:8-jre-alpine + ENTRYPOINT ["/usr/bin/java", "-jar", "/opt/app/pm-mapper/pm-mapper.jar"] ARG JAR WORKDIR /opt/app/pm-mapper + +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 + +USER pm-mapper |