diff options
| author |   RehanRaza <muhammad.rehan.raza@est.tech> | 2019-03-05 09:05:32 +0000 |
|---|---|---|
| committer | RehanRaza <muhammad.rehan.raza@est.tech> | 2019-03-05 09:05:32 +0000 |
| commit | ccce31f1c410462ce5fb297584049463c86c775d (patch) | |
| tree | 585c3b15e919d72bf63a886891d0f72a207b4451 | |
| parent | e63b7179e260e9f9db64101409b2872eab1fe639 (diff) | |
Fix Docker image
Change-Id: Icf8a37ea63e78d70256571d1bce424e629a04b55
Issue-ID: DCAEGEN2-1269
Signed-off-by: RehanRaza <muhammad.rehan.raza@est.tech>
| -rw-r--r-- | datafile-app-server/pom.xml | 20 | ||||
| -rw-r--r-- | datafile-app-server/src/main/resources/Dockerfile | 3 |
2 files changed, 10 insertions, 13 deletions
diff --git a/datafile-app-server/pom.xml b/datafile-app-server/pom.xml index 3ceccdbe..d74889da 100644 --- a/datafile-app-server/pom.xml +++ b/datafile-app-server/pom.xml @@ -59,11 +59,10 @@ <version>${dockerfile.maven.version}</version> <configuration> <repository>${onap.nexus.dockerregistry.daily}/${docker.image.name}</repository> - <tag>${project.version}</tag> <dockerfile>${project.build.outputDirectory}/Dockerfile</dockerfile> - <buildArgs> - <JAR_FILE>${project.build.finalName}.jar</JAR_FILE> - </buildArgs> + <imageTags> + <tag>latest</tag> + </imageTags> </configuration> <executions> <execution> @@ -78,11 +77,10 @@ <phase>deploy</phase> <goals> <goal>tag</goal> + <goal>push</goal> </goals> <configuration> - <image>${docker.image.name}:latest</image> - <newName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:latest</newName> - <pushImage>true</pushImage> + <image>${onap.nexus.dockerregistry.daily}/${docker.image.name}:latest</image> </configuration> </execution> <execution> @@ -90,11 +88,11 @@ <phase>deploy</phase> <goals> <goal>tag</goal> + <goal>push</goal> </goals> <configuration> - <image>${docker.image.name}:latest</image> + <image>${onap.nexus.dockerregistry.daily}/${docker.image.name}:latest</image> <newName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:${project.version}</newName> - <pushImage>true</pushImage> </configuration> </execution> <execution> @@ -102,11 +100,11 @@ <phase>deploy</phase> <goals> <goal>tag</goal> + <goal>push</goal> </goals> <configuration> - <image>${docker.image.name}:latest</image> + <image>${onap.nexus.dockerregistry.daily}/${docker.image.name}:latest</image> <newName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:${project.version}-${maven.build.timestamp}Z</newName> - <pushImage>true</pushImage> </configuration> </execution> </executions> diff --git a/datafile-app-server/src/main/resources/Dockerfile b/datafile-app-server/src/main/resources/Dockerfile index 1869d364..6ab30cc2 100644 --- a/datafile-app-server/src/main/resources/Dockerfile +++ b/datafile-app-server/src/main/resources/Dockerfile @@ -22,8 +22,7 @@ FROM openjdk:8-jre-alpine WORKDIR /opt/app/datafile RUN mkdir -p /var/log/ONAP -ARG JAR_FILE -ADD /target/${JAR_FILE} /opt/app/datafile/datafile-app-server.jar +ADD /target/datafile-app-server.jar /opt/app/datafile/ ADD /config/application.yaml /opt/app/datafile/config/ ADD /config/cacerts /opt/app/datafile/config/ |