summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBartosz Gardziejewski <bartosz.gardziejewski@nokia.com>2020-02-13 10:14:16 +0100
committerBartosz Gardziejewski <bartosz.gardziejewski@nokia.com>2020-02-13 10:23:59 +0100
commit41a5418f3d93fb09d5544c2070b42d5d5f4e216a (patch)
treea2ef639e0fdc46c4acae7bb35018700d1dfebc79
parentdd700fc459be08a807646a90f6dd106f99001860 (diff)
Adjust docker versions and names
Issue-ID: AAF-995 Signed-off-by: Bartosz Gardziejewski <bartosz.gardziejewski@nokia.com> Change-Id: If9f9bd19b34c655d8277b2d981d357812c3371b2
-rw-r--r--certService/Dockerfile6
-rw-r--r--certService/pom.xml10
2 files changed, 9 insertions, 7 deletions
diff --git a/certService/Dockerfile b/certService/Dockerfile
index 5bd6b18e..ff8a4224 100644
--- a/certService/Dockerfile
+++ b/certService/Dockerfile
@@ -1,6 +1,6 @@
FROM docker.io/openjdk:11-jre-slim
-ARG VERSION=1.0.0-SNAPSHOT
+ARG VERSION=${project.version}
RUN groupadd certService && useradd -g certService certService
@@ -8,6 +8,6 @@ RUN chown -R certService:certService /var/log
USER certService:certService
-COPY target/cert-service-${VERSION}.jar ./opt/onap/aaf/certservice/cert-service.jar
+COPY target/aaf-certservice-api-${VERSION}.jar ./opt/onap/aaf/certservice/aaf-certservice-api.jar
-ENTRYPOINT ["java","-jar","./opt/onap/aaf/certservice/cert-service.jar"]
+ENTRYPOINT ["java","-jar","./opt/onap/aaf/certservice/aaf-certservice-api.jar"]
diff --git a/certService/pom.xml b/certService/pom.xml
index 393d3bc4..194e2ae4 100644
--- a/certService/pom.xml
+++ b/certService/pom.xml
@@ -42,6 +42,8 @@
<docker.tag>${project.version}</docker.tag>
<springdoc-openapi-maven-plugin.apiDocsUrl>http://localhost:8080/v3/api-docs
</springdoc-openapi-maven-plugin.apiDocsUrl>
+ <docker-maven-plugin.image-name>onap/${project.artifactId}</docker-maven-plugin.image-name>
+ <springdoc-openapi-maven-plugin.version>0.2</springdoc-openapi-maven-plugin.version>
</properties>
<dependencyManagement>
@@ -190,7 +192,7 @@
<plugin>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-maven-plugin</artifactId>
- <version>0.2</version>
+ <version>${springdoc-openapi-maven-plugin.version}</version>
<executions>
<execution>
<phase>integration-test</phase>
@@ -237,7 +239,7 @@
</goals>
<configuration>
<removeAll>true</removeAll>
- <image>onap/cert-service</image>
+ <image>${docker-maven-plugin.image-name}</image>
</configuration>
</execution>
<execution>
@@ -269,7 +271,7 @@
<goal>push</goal>
</goals>
<configuration>
- <image>onap/cert-service</image>
+ <image>${docker-maven-plugin.image-name}</image>
</configuration>
</execution>
</executions>
@@ -284,7 +286,7 @@
</authConfig>
<images>
<image>
- <name>onap/cert-service</name>
+ <name>${docker-maven-plugin.image-name}</name>
<alias>cert-service</alias>
<build>
<dockerFile>${project.basedir}/Dockerfile</dockerFile >