diff options
| author |   efiacor <fiachra.corcoran@est.tech> | 2020-02-27 16:46:20 +0000 |
|---|---|---|
| committer | efiacor <fiachra.corcoran@est.tech> | 2020-03-04 14:21:22 +0000 |
| commit | d20d5f5749f30f547ff80b0821eff8c1c4f3d681 (patch) | |
| tree | 32c079ac114f63d4391c56fec6ad6a536bfbb18a | |
| parent | 90fa2ce92f0f41545a2b92dc3e2a9e29c326141a (diff) | |
Implementing CSI Docker Benchmark v.1.2.0
Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Change-Id: I117729069a170c1b394e4896808c41eb2a75eaa1
Issue-ID: DMAAP-1382
| -rwxr-xr-x | datarouter-node/pom.xml | 4 | ||||
| -rw-r--r-- | datarouter-node/src/main/resources/docker/Dockerfile | 2 | ||||
| -rwxr-xr-x | datarouter-prov/pom.xml | 4 | ||||
| -rw-r--r-- | datarouter-prov/src/main/resources/docker/Dockerfile | 2 | ||||
| -rwxr-xr-x | datarouter-subscriber/pom.xml | 4 | ||||
| -rwxr-xr-x | pom.xml | 4 |
6 files changed, 13 insertions, 7 deletions
diff --git a/datarouter-node/pom.xml b/datarouter-node/pom.xml index d9650c23..fd859bef 100755 --- 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 c6f6c61f..0d2331fd 100644 --- 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 791cbc3e..334a57fb 100755 --- 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 61d32473..b99ab42b 100644 --- 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 28372f4e..a2e99366 100755 --- 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> @@ -68,8 +68,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> |