diff options
Diffstat (limited to 'datarouter-node')
| -rwxr-xr-x | datarouter-node/pom.xml | 28 | ||||
| -rw-r--r-- | datarouter-node/src/main/resources/docker/Dockerfile | 7 |
2 files changed, 16 insertions, 19 deletions
diff --git a/datarouter-node/pom.xml b/datarouter-node/pom.xml index 29e3ce47..27d21c05 100755 --- a/datarouter-node/pom.xml +++ b/datarouter-node/pom.xml @@ -3,6 +3,7 @@ * org.onap.dmaap * =========================================================================== * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * Modifications Copyright (C) 2018 Nokia. All rights reserved. * =========================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,7 +26,7 @@ <parent> <groupId>org.onap.dmaap.datarouter</groupId> <artifactId>parent</artifactId> - <version>1.0.2-SNAPSHOT</version> + <version>1.0.3-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>datarouter-node</artifactId> @@ -234,10 +235,10 @@ <plugin> <groupId>com.spotify</groupId> <artifactId>docker-maven-plugin</artifactId> - <version>1.0.0</version> + <version>${docker.maven.plugin.version}</version> <configuration> <imageName>${onap.nexus.dockerregistry.daily}/${datarouter.node.image.name}</imageName> - <dockerDirectory>${docker.location}</dockerDirectory> + <baseImage>java:8</baseImage> <serverId>${onap.nexus.dockerregistry.daily}</serverId> <skipDockerBuild>false</skipDockerBuild> <imageTags> @@ -245,22 +246,25 @@ <imageTag>latest</imageTag> </imageTags> <forceTags>true</forceTags> + <entryPoint>["/startup.sh", "start"]</entryPoint> <resources> <resource> - <targetPath>/</targetPath> - <directory>${project.basedir}</directory> - <excludes> - <exclude>target/**/*</exclude> - <exclude>pom.xml</exclude> - </excludes> + <targetPath>/opt</targetPath> + <directory>${project.build.directory}/opt</directory> </resource> - <resource> <targetPath>/</targetPath> - <directory>${project.build.directory}</directory> - <include>**/**</include> + <directory>${docker.location}</directory> + <include>startup.sh</include> </resource> </resources> + <runs> + <run>chmod 0700 /startup.sh</run> + </runs> + <exposes> + <expose>8080</expose> + <expose>8443</expose> + </exposes> </configuration> </plugin> </plugins> diff --git a/datarouter-node/src/main/resources/docker/Dockerfile b/datarouter-node/src/main/resources/docker/Dockerfile deleted file mode 100644 index fbf54566..00000000 --- a/datarouter-node/src/main/resources/docker/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM java:8
-ADD opt /opt/
-ADD startup.sh /startup.sh
-RUN chmod 700 /startup.sh
-ENTRYPOINT ./startup.sh start
-EXPOSE 8443
-EXPOSE 8080
\ No newline at end of file |