summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--dcae-analytics/dcae-analytics-tca-web/Dockerfile7
-rw-r--r--dcae-analytics/dcae-analytics-tca-web/docker/Dockerfile20
-rw-r--r--dcae-analytics/dcae-analytics-tca-web/logback.xml (renamed from dcae-analytics/dcae-analytics-tca-web/docker/logback.xml)0
-rw-r--r--dcae-analytics/dcae-analytics-tca-web/pom.xml41
4 files changed, 16 insertions, 52 deletions
diff --git a/dcae-analytics/dcae-analytics-tca-web/Dockerfile b/dcae-analytics/dcae-analytics-tca-web/Dockerfile
index 19afab7..0e2a6e8 100644
--- a/dcae-analytics/dcae-analytics-tca-web/Dockerfile
+++ b/dcae-analytics/dcae-analytics-tca-web/Dockerfile
@@ -8,13 +8,12 @@ FROM openjdk:8-jre-alpine
MAINTAINER Rajiv Singla <rs153v@att.com>
VOLUME /tmp
-ADD docker/logback.xml logback.xml
-ADD target/dcae-analytics-tca-web-3.0.0-SNAPSHOT.jar dcae-analytics-tca-web.jar
+ADD logback.xml logback.xml
EXPOSE 9091
ENTRYPOINT ["java", \
"-Djava.security.egd=file:/dev/./urandom", \
"-Dlogging.config=logback.xml", \
- "-Dlogging.file=logs/dcae-analytics-tca-web.log", \
+ "-Dlogging.file=logs/${project.artifactId}.log", \
"-Dspring.profiles.active=dev", \
- "-jar", "dcae-analytics-tca-web.jar"]
+ "-jar", "${project.build.finalName}.jar"]
diff --git a/dcae-analytics/dcae-analytics-tca-web/docker/Dockerfile b/dcae-analytics/dcae-analytics-tca-web/docker/Dockerfile
deleted file mode 100644
index eccef3b..0000000
--- a/dcae-analytics/dcae-analytics-tca-web/docker/Dockerfile
+++ /dev/null
@@ -1,20 +0,0 @@
-# NOTE: This Dockerfile is auto generated and filtered via maven resources plugin.
-# Edits to generated Dockerfile will NOT be saved.
-# Only changes made in docker/Dockerfile template file will be persistent
-# ==========================================================================
-
-FROM openjdk:8-jre-alpine
-
-MAINTAINER Rajiv Singla <rs153v@att.com>
-
-VOLUME /tmp
-ADD docker/logback.xml logback.xml
-ADD target/${project.build.finalName}.jar ${project.artifactId}.jar
-EXPOSE 9091
-
-ENTRYPOINT ["java", \
- "-Djava.security.egd=file:/dev/./urandom", \
- "-Dlogging.config=logback.xml", \
- "-Dlogging.file=logs/${project.artifactId}.log", \
- "-Dspring.profiles.active=dev", \
- "-jar", "${project.artifactId}.jar"]
diff --git a/dcae-analytics/dcae-analytics-tca-web/docker/logback.xml b/dcae-analytics/dcae-analytics-tca-web/logback.xml
index 57348d3..57348d3 100644
--- a/dcae-analytics/dcae-analytics-tca-web/docker/logback.xml
+++ b/dcae-analytics/dcae-analytics-tca-web/logback.xml
diff --git a/dcae-analytics/dcae-analytics-tca-web/pom.xml b/dcae-analytics/dcae-analytics-tca-web/pom.xml
index 2e1195d..6959bec 100644
--- a/dcae-analytics/dcae-analytics-tca-web/pom.xml
+++ b/dcae-analytics/dcae-analytics-tca-web/pom.xml
@@ -116,14 +116,6 @@
<resource>
<directory>${project.build.directory}/git</directory>
</resource>
- <resource>
- <directory>docker</directory>
- <includes>
- <include>Dockerfile</include>
- </includes>
- <targetPath>${project.basedir}</targetPath>
- <filtering>true</filtering>
- </resource>
</resources>
<plugins>
@@ -141,27 +133,20 @@
<artifactId>docker-maven-plugin</artifactId>
<configuration>
<skipDocker>false</skipDocker>
- <repository>${docker.repository}/onap/${project.groupId}.${project.artifactId}</repository>
- <tag>${project.version}</tag>
+ <imageName>${docker.repository}/onap/${project.groupId}.${project.artifactId}</imageName>
+ <dockerDirectory>${project.basedir}</dockerDirectory>
+ <resources>
+ <resource>
+ <targetPath>${project.basedir}</targetPath>
+ <directory>${project.build.directory}</directory>
+ <include>${project.build.finalName}.jar</include>
+ </resource>
+ </resources>
+ <imageTags>
+ <imageTag>${project.version}</imageTag>
+ <imageTag>latest</imageTag>
+ </imageTags>
</configuration>
-<!-- <artifactId>dockerfile-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>build-image</id>
- <phase>package</phase>
- <goals>
- <goal>build</goal>
- </goals>
- </execution>
- <execution>
- <id>docker-push</id>
- <phase>deploy</phase>
- <goals>
- <goal>push</goal>
- </goals>
- </execution>
- </executions>
--->
</plugin>
</plugins>
</build>