Merge "Implementing CSI Docker Benchmark v.1.2.0"

diff --git a/datarouter-node/pom.xml b/datarouter-node/pom.xml
index d9650c2..fd859be 100755 (executable)
--- a/datarouter-node/pom.xml
+++ b/datarouter-node/pom.xml
@@ -169,7 +169,9 @@
                                     <name>${datarouter.node.image.name}</name>
                                     <build>
                                         <cleanup>try</cleanup>
-                                        <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
+                                        <noCache>true</noCache>
+                                        <optimise>true</optimise>
+                                        <contextDir>${basedir}/target/docker-stage</contextDir>
                                         <dockerFile>Dockerfile</dockerFile>
                                         <tags>
                                             <tag>${dockertag1}</tag>

diff --git a/datarouter-node/src/main/resources/docker/Dockerfile b/datarouter-node/src/main/resources/docker/Dockerfile
index c6f6c61..0d2331f 100644 (file)
--- a/datarouter-node/src/main/resources/docker/Dockerfile
+++ b/datarouter-node/src/main/resources/docker/Dockerfile
@@ -37,4 +37,4 @@ RUN addgroup -S -g 1001 onap \
     && adduser -S -u 1000 dradmin -G onap \
     && chown -R dradmin:onap /opt/ /var/
 
-USER dradmin
\ No newline at end of file
+USER dradmin

diff --git a/datarouter-prov/pom.xml b/datarouter-prov/pom.xml
index 791cbc3..334a57f 100755 (executable)
--- a/datarouter-prov/pom.xml
+++ b/datarouter-prov/pom.xml
@@ -225,7 +225,9 @@
                                     <name>${datarouter.prov.image.name}</name>
                                     <build>
                                         <cleanup>try</cleanup>
-                                        <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
+                                        <noCache>true</noCache>
+                                        <optimise>true</optimise>
+                                        <contextDir>${basedir}/target/docker-stage</contextDir>
                                         <dockerFile>Dockerfile</dockerFile>
                                         <tags>
                                             <tag>${dockertag1}</tag>

diff --git a/datarouter-prov/src/main/resources/docker/Dockerfile b/datarouter-prov/src/main/resources/docker/Dockerfile
index 61d3247..b99ab42 100644 (file)
--- a/datarouter-prov/src/main/resources/docker/Dockerfile
+++ b/datarouter-prov/src/main/resources/docker/Dockerfile
@@ -37,4 +37,4 @@ RUN addgroup -S -g 1001 onap \
     && adduser -S -u 1000 dradmin -G onap \
     && chown -R dradmin:onap /opt/ /var/
 
-USER dradmin
+USER dradmin
\ No newline at end of file

diff --git a/datarouter-subscriber/pom.xml b/datarouter-subscriber/pom.xml
index 28372f4..a2e9936 100755 (executable)
--- a/datarouter-subscriber/pom.xml
+++ b/datarouter-subscriber/pom.xml
@@ -112,7 +112,9 @@
                                     <name>${datarouter.sub.image.name}</name>
                                     <build>
                                         <cleanup>try</cleanup>
-                                        <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
+                                        <noCache>true</noCache>
+                                        <optimise>true</optimise>
+                                        <contextDir>${basedir}/target/docker-stage</contextDir>
                                         <dockerFile>Dockerfile</dockerFile>
                                         <tags>
                                             <tag>${dockertag1}</tag>

diff --git a/pom.xml b/pom.xml
index 4bd7bbb..b31a08a 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -66,8 +66,8 @@
         <aaf-cadi-aaf.version>2.1.15</aaf-cadi-aaf.version>
         <commons-codec.version>1.13</commons-codec.version>
         <gmaven-plugin.version>1.5</gmaven-plugin.version>
-        <io.fabric8.version>0.28.0</io.fabric8.version>
-        <docker.apiVersion>1.23</docker.apiVersion>
+        <io.fabric8.version>0.33.0</io.fabric8.version>
+        <docker.apiVersion>2.2.54</docker.apiVersion>
         <commons-lang.version>2.4</commons-lang.version>
         <commons-io.version>2.6</commons-io.version>
         <httpcore.version>4.4</httpcore.version>