diff options
| author |   Michael Lando <ml636r@att.com> | 2018-05-11 18:26:46 +0300 |
|---|---|---|
| committer | Michael Lando <ml636r@att.com> | 2018-05-11 18:26:46 +0300 |
| commit | f5397220a48a770aa2ccca10ffb49a88621c74fa (patch) | |
| tree | bcdc5c08d96e41efc89d0e59010fcaebca5d627b | |
| parent | f2da63dbece0e4b1d7058a9ccc9cbf7934ce2c8c (diff) | |
update pom
update version.properties
update maven docker plugin
uncomment docker build
Issue-ID: SDC-1318
Change-Id: Idd85b53ecb5c95e9c36ece64c5edff97c7353ffe
Signed-off-by: Michael Lando <ml636r@att.com>
| -rw-r--r-- | pom.xml | 178 | ||||
| -rw-r--r-- | version.properties | 2 |
2 files changed, 90 insertions, 90 deletions
@@ -35,100 +35,100 @@ <plugin> <groupId>io.fabric8</groupId> <artifactId>docker-maven-plugin</artifactId> - <version>0.15.1</version> + <version>0.25.2</version> <configuration> <images> <!-- base_sdc-jetty for backend and frontend --> - <!--<image>--> - <!--<name>onap/base_sdc-jetty</name>--> - <!--<alias>base_sdc-jetty</alias>--> - <!--<build>--> - <!--<cleanup>true</cleanup>--> - <!--<tags>--> - <!--<tag>${docker.tag}</tag>--> - <!--<tag>${docker.latest.tag}</tag>--> - <!--</tags>--> - <!--<dockerFileDir>${project.basedir}/base_sdc-jetty</dockerFileDir>--> - <!--</build>--> - <!--</image>--> - <!-- base_sdc-kibana --> - <!--<image>--> - <!--<name>onap/base_sdc-kibana</name>--> - <!--<alias>base_sdc-kibana</alias>--> - <!--<build>--> - <!--<cleanup>true</cleanup>--> - <!--<tags>--> - <!--<tag>${docker.tag}</tag>--> - <!--<tag>${docker.latest.tag}</tag>--> - <!--</tags>--> - <!--<dockerFileDir>${project.basedir}/base_sdc-kibana</dockerFileDir>--> - <!--</build>--> - <!--</image>--> - <!-- base_sdc-cassandra --> - <!--<image>--> - <!--<name>onap/base_sdc-cassandra</name>--> - <!--<alias>base_sdc-cassandra</alias>--> - <!--<build>--> - <!--<cleanup>true</cleanup>--> - <!--<tags>--> - <!--<tag>${docker.tag}</tag>--> - <!--<tag>${docker.latest.tag}</tag>--> - <!--</tags>--> - <!--<dockerFileDir>${project.basedir}/base_sdc-cassandra</dockerFileDir>--> - <!--</build>--> - <!--</image>--> - <!--<!– base_sdc-cqlsh –>--> - <!--<image>--> - <!--<name>onap/base_sdc-cqlsh</name>--> - <!--<alias>base_sdc-cqlsh</alias>--> - <!--<build>--> - <!--<cleanup>true</cleanup>--> - <!--<tags>--> - <!--<tag>${docker.tag}</tag>--> - <!--<tag>${docker.latest.tag}</tag>--> - <!--</tags>--> - <!--<dockerFileDir>${project.basedir}/base_sdc-cqlsh</dockerFileDir>--> - <!--</build>--> - <!--</image>--> + <image> + <name>onap/base_sdc-jetty</name> + <alias>base_sdc-jetty</alias> + <build> + <cleanup>true</cleanup> + <tags> + <tag>${docker.tag}</tag> + <tag>${docker.latest.tag}</tag> + </tags> + <dockerFileDir>${project.basedir}/base_sdc-jetty</dockerFileDir> + </build> + </image> + <!--base_sdc-kibana--> + <image> + <name>onap/base_sdc-kibana</name> + <alias>base_sdc-kibana</alias> + <build> + <cleanup>true</cleanup> + <tags> + <tag>${docker.tag}</tag> + <tag>${docker.latest.tag}</tag> + </tags> + <dockerFileDir>${project.basedir}/base_sdc-kibana</dockerFileDir> + </build> + </image> + <!--base_sdc-cassandra--> + <image> + <name>onap/base_sdc-cassandra</name> + <alias>base_sdc-cassandra</alias> + <build> + <cleanup>true</cleanup> + <tags> + <tag>${docker.tag}</tag> + <tag>${docker.latest.tag}</tag> + </tags> + <dockerFileDir>${project.basedir}/base_sdc-cassandra</dockerFileDir> + </build> + </image> + <!-- base_sdc-cqlsh --> + <image> + <name>onap/base_sdc-cqlsh</name> + <alias>base_sdc-cqlsh</alias> + <build> + <cleanup>true</cleanup> + <tags> + <tag>${docker.tag}</tag> + <tag>${docker.latest.tag}</tag> + </tags> + <dockerFileDir>${project.basedir}/base_sdc-cqlsh</dockerFileDir> + </build> + </image> <!--base_sdc-python--> - <!--<image>--> - <!--<name>onap/base_sdc-python</name>--> - <!--<alias>base_sdc-python</alias>--> - <!--<build>--> - <!--<cleanup>true</cleanup>--> - <!--<tags>--> - <!--<tag>${docker.tag}</tag>--> - <!--<tag>${docker.latest.tag}</tag>--> - <!--</tags>--> - <!--<dockerFileDir>${project.basedir}/base_sdc-python</dockerFileDir>--> - <!--</build>--> - <!--</image>--> + <image> + <name>onap/base_sdc-python</name> + <alias>base_sdc-python</alias> + <build> + <cleanup>true</cleanup> + <tags> + <tag>${docker.tag}</tag> + <tag>${docker.latest.tag}</tag> + </tags> + <dockerFileDir>${project.basedir}/base_sdc-python</dockerFileDir> + </build> + </image> <!--base_sdc-elasticsearch--> - <!--<image>--> - <!--<name>onap/base_sdc-elasticsearch</name>--> - <!--<alias>base_sdc-elasticsearch</alias>--> - <!--<build>--> - <!--<cleanup>true</cleanup>--> - <!--<tags>--> - <!--<tag>${docker.tag}</tag>--> - <!--<tag>${docker.latest.tag}</tag>--> - <!--</tags>--> - <!--<dockerFileDir>${project.basedir}/base_sdc-elasticsearch</dockerFileDir>--> - <!--</build>--> - <!--</image>--> - <!-- base_sdc-sanity --> - <!--<image>--> - <!--<name>onap/base_sdc-sanity</name>--> - <!--<alias>base_sdc-sanity</alias>--> - <!--<build>--> - <!--<cleanup>true</cleanup>--> - <!--<tags>--> - <!--<tag>${docker.tag}</tag>--> - <!--<tag>${docker.latest.tag}</tag>--> - <!--</tags>--> - <!--<dockerFileDir>${project.basedir}/base_sdc-sanity</dockerFileDir>--> - <!--</build>--> - <!--</image>--> + <image> + <name>onap/base_sdc-elasticsearch</name> + <alias>base_sdc-elasticsearch</alias> + <build> + <cleanup>true</cleanup> + <tags> + <tag>${docker.tag}</tag> + <tag>${docker.latest.tag}</tag> + </tags> + <dockerFileDir>${project.basedir}/base_sdc-elasticsearch</dockerFileDir> + </build> + </image> + <!--base_sdc-sanity--> + <image> + <name>onap/base_sdc-sanity</name> + <alias>base_sdc-sanity</alias> + <build> + <cleanup>true</cleanup> + <tags> + <tag>${docker.tag}</tag> + <tag>${docker.latest.tag}</tag> + </tags> + <dockerFileDir>${project.basedir}/base_sdc-sanity</dockerFileDir> + </build> + </image> <!-- base_sdc-vnc --> <image> <name>onap/base_sdc-vnc</name> diff --git a/version.properties b/version.properties index 235314e..a61846b 100644 --- a/version.properties +++ b/version.properties @@ -5,7 +5,7 @@ major=1 minor=3 -patch=0 +patch=1 base_version=${major}.${minor}.${patch} |