- <plugin>\r
- <groupId>com.spotify</groupId>\r
- <artifactId>docker-maven-plugin</artifactId>\r
- <version>0.4.11</version>\r
- <configuration>\r
- <imageName>onap/aaf/authz-service</imageName>\r
- <dockerDirectory>${dockerLocation}</dockerDirectory>\r
- <serverId>docker-hub</serverId>\r
- <registryUrl>https://${docker.registry}</registryUrl>\r
- <imageTags>\r
- <imageTag>${project.version}</imageTag>\r
- <imageTag>latest</imageTag>\r
- </imageTags>\r
- <resources>\r
- <resource>\r
- <targetPath>/</targetPath>\r
- <directory>/${basedir}/target/opt</directory>\r
- <filtering>true</filtering>\r
- <includes>\r
- <include>**/*</include>\r
- </includes>\r
- </resource>\r
- </resources>\r
- <forceTags>true</forceTags>\r
- </configuration>\r
- </plugin>\r
- <plugin>\r
- <artifactId>maven-resources-plugin</artifactId>\r
- <version>2.7</version>\r
- <executions>\r
- <execution>\r
+<plugin>\r
+ <groupId>com.spotify</groupId>\r
+ <artifactId>docker-maven-plugin</artifactId>\r
+ <version>1.0.0</version>\r
+ <configuration>\r
+ <imageName>onap/aaf/authz-service</imageName>\r
+ <!-- <dockerDirectory>${dockerLocation}</dockerDirectory> -->\r
+ <dockerDirectory>${basedir}/src/main/resources/docker</dockerDirectory>\r
+ <imageTags>\r
+ <imageTag>latest</imageTag>\r
+ <imageTag>${project.docker.latesttagtimestamp.version}</imageTag>\r
+ <imageTag>${project.docker.latesttag.version}</imageTag>\r
+ </imageTags>\r
+ <forceTags>true</forceTags>\r
+ <!-- <resources>\r
+ <resource>\r
+ <targetPath>/</targetPath>\r
+ <directory>${project.build.directory}/opt</directory>\r
+ <filtering>true</filtering>\r
+ <includes>\r
+ <include>**/**</include>\r
+ </includes>\r
+ </resource>\r
+ </resources> --> \r
+ <resources>\r
+ <resource>\r
+ <targetPath>/</targetPath>\r
+ <directory>${project.build.directory}/opt</directory>\r
+ <include>${project.build.finalName}.jar</include>\r
+ </resource>\r
+ <resource>\r
+ <targetPath>/</targetPath>\r
+ <directory>${project.build.directory}</directory>\r
+ <include>**/**</include>\r
+ </resource>\r
+ </resources>\r
+ </configuration>\r
+ <executions>\r
+ <execution>\r
+ <id>build-image</id>\r
+ <phase>package</phase>\r
+ <goals>\r
+ <goal>build</goal>\r
+ </goals>\r
+ <configuration>\r
+ <skipDockerBuild>${skip.docker.build}</skipDockerBuild>\r
+ </configuration>\r
+ </execution> \r
+\r
+ <execution>\r
+ <id>tag-image-project-version</id>\r
+ <phase>package</phase>\r
+ <goals>\r
+ <goal>tag</goal>\r
+ </goals>\r
+ <configuration>\r
+ <image>onap/aaf/authz-service</image>\r
+ <newName>${docker.push.registry}/onap/aaf/authz-service:${project.version}</newName>\r
+ <skipDockerTag>${skip.docker.push}</skipDockerTag>\r
+ </configuration>\r
+ </execution>\r
+ \r
+ <execution>\r
+ <id>tag-image-latest</id>\r
+ <phase>package</phase>\r
+ <goals>\r
+ <goal>tag</goal>\r
+ </goals>\r
+ <configuration>\r
+ <image>onap/aaf/authz-service</image>\r
+ <newName>${docker.push.registry}/onap/aaf/authz-service:latest</newName>\r
+ <skipDockerTag>${skip.docker.push}</skipDockerTag>\r
+ </configuration>\r
+ </execution>\r
+ \r
+ <execution>\r
+ <id>push-image-latest</id>\r
+ <phase>deploy</phase>\r
+ <goals>\r
+ <goal>push</goal>\r
+ </goals>\r
+ <configuration>\r
+ <imageName>${docker.push.registry}/onap/aaf/authz-service:${project.version}</imageName>\r
+ <skipDockerPush>${skip.docker.push}</skipDockerPush>\r
+ </configuration>\r
+ </execution>\r
+ \r
+ <execution>\r
+ <id>push-image</id>\r
+ <phase>deploy</phase>\r
+ <goals>\r
+ <goal>push</goal>\r
+ </goals>\r
+ <configuration>\r
+ <imageName>${docker.push.registry}/onap/aaf/authz-service:latest</imageName>\r
+ <skipDockerPush>${skip.docker.push}</skipDockerPush>\r
+ </configuration>\r
+ </execution>\r
+ </executions>\r
+ </plugin>\r
+\r
+ <plugin>\r
+ <artifactId>maven-resources-plugin</artifactId>\r
+ <version>2.7</version>\r
+ <executions>\r
+ <execution>\r