Code Review
/
ccsdk
/
distribution.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Move CSIT to ccsdk/distribution repo"
[ccsdk/distribution.git]
/
dgbuilder-docker
/
pom.xml
diff --git
a/dgbuilder-docker/pom.xml
b/dgbuilder-docker/pom.xml
index
2c160fc
..
3bcfff0
100644
(file)
--- a/
dgbuilder-docker/pom.xml
+++ b/
dgbuilder-docker/pom.xml
@@
-1,18
+1,16
@@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-root</artifactId>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-root</artifactId>
- <version>
0.4
.1-SNAPSHOT</version>
+ <version>
1.1
.1-SNAPSHOT</version>
</parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-dgbuilder-docker</artifactId>
</parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-dgbuilder-docker</artifactId>
- <version>
0.4
.1-SNAPSHOT</version>
+ <version>
1.1
.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-distribution :: dgbuilder-docker</name>
<packaging>pom</packaging>
<name>ccsdk-distribution :: dgbuilder-docker</name>
@@
-25,6
+23,7
@@
<image.name>onap/ccsdk-dgbuilder-image</image.name>
<ccsdk.project.version>${project.version}</ccsdk.project.version>
<ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
<image.name>onap/ccsdk-dgbuilder-image</image.name>
<ccsdk.project.version>${project.version}</ccsdk.project.version>
<ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
+ <uniquedockertag>${env.UNIQUE_DOCKER_TAG}</uniquedockertag>
</properties>
<build>
</properties>
<build>
@@
-41,7
+40,7
@@
<goal>execute</goal>
</goals>
<configuration>
<goal>execute</goal>
</goals>
<configuration>
- <source>${basedir}/../src/main/scripts/TagVersion.groovy</source>
+ <source>${basedir}/../src/main/scripts/Tag
Snapshot
Version.groovy</source>
</configuration>
</execution>
</executions>
</configuration>
</execution>
</executions>
@@
-172,7
+171,7
@@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>0.
16.5
</version>
+ <version>0.
28.0
</version>
<inherited>false</inherited>
<configuration>
<inherited>false</inherited>
<configuration>
@@
-182,11
+181,12
@@
<build>
<cleanup>try</cleanup>
<dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
<build>
<cleanup>try</cleanup>
<dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
- <dockerFile>
${basedir}/target/docker-stage/
Dockerfile</dockerFile>
+ <dockerFile>Dockerfile</dockerFile>
<tags>
<tag>${project.docker.latestminortag.version}</tag>
<tag>${project.docker.latestfulltag.version}</tag>
<tag>${project.docker.latesttagtimestamp.version}</tag>
<tags>
<tag>${project.docker.latestminortag.version}</tag>
<tag>${project.docker.latestfulltag.version}</tag>
<tag>${project.docker.latesttagtimestamp.version}</tag>
+ <tag>${project.docker.uniquedockertag.version}</tag>
</tags>
</build>
</image>
</tags>
</build>
</image>