summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Daugherty <rd472p@att.com>2017-07-20 14:24:04 +0000
committerGerrit Code Review <gerrit@onap.org>2017-07-20 14:24:04 +0000
commit9871e070485e01dd97f70e3111f3184229ab9928 (patch)
treeb0e67ada24407efa2116b7ded58dd1f99fc1eac8
parent3efc13f943058c2679db322ec4e38dad20f98cc5 (diff)
parent44b1e28d3774173685b9ca19b7e6be259c9bd7d5 (diff)
Merge "Updating Dockerfile & .gitreview"
-rw-r--r--packages/docker/src/main/docker/docker-files/Dockerfile.jacoco2
-rw-r--r--packages/docker/src/main/docker/docker-files/Dockerfile.mso-arquillian4
-rw-r--r--packages/docker/src/main/docker/docker-files/Dockerfile.mso-chef-final4
-rw-r--r--packages/docker/src/main/docker/docker-files/Dockerfile.ubuntu-16.04-update2
-rw-r--r--packages/docker/src/main/docker/docker-files/Dockerfile.wildfly-104
5 files changed, 8 insertions, 8 deletions
diff --git a/packages/docker/src/main/docker/docker-files/Dockerfile.jacoco b/packages/docker/src/main/docker/docker-files/Dockerfile.jacoco
index f00cdd019c..d18a015b06 100644
--- a/packages/docker/src/main/docker/docker-files/Dockerfile.jacoco
+++ b/packages/docker/src/main/docker/docker-files/Dockerfile.jacoco
@@ -2,7 +2,7 @@
FROM ubuntu:14.04
### File Author / Maintainer
-MAINTAINER "The OpenECOMP Team"
+MAINTAINER "The ONAP Team"
LABEL Description="This image is used to get jacoco result from a jboss image" Version="1.0"
ARG http_proxy
diff --git a/packages/docker/src/main/docker/docker-files/Dockerfile.mso-arquillian b/packages/docker/src/main/docker/docker-files/Dockerfile.mso-arquillian
index b07c8c9472..c279597d34 100644
--- a/packages/docker/src/main/docker/docker-files/Dockerfile.mso-arquillian
+++ b/packages/docker/src/main/docker/docker-files/Dockerfile.mso-arquillian
@@ -2,8 +2,8 @@ FROM openecomp/wildfly:1.0
### File Author / Maintainer
-MAINTAINER "The OpenECOMP Team"
-LABEL Description="This image contains the OpenECOMP MSO base for arquillian" Version="1.0"
+MAINTAINER "The ONAP Team"
+LABEL Description="This image contains the ONAP SO base for arquillian" Version="1.0"
ENV CHEF_REPO_NAME="chef-repo"
ENV CHEF_CONFIG_NAME="mso-config"
diff --git a/packages/docker/src/main/docker/docker-files/Dockerfile.mso-chef-final b/packages/docker/src/main/docker/docker-files/Dockerfile.mso-chef-final
index ff7f44bcfd..16d062ec82 100644
--- a/packages/docker/src/main/docker/docker-files/Dockerfile.mso-chef-final
+++ b/packages/docker/src/main/docker/docker-files/Dockerfile.mso-chef-final
@@ -2,8 +2,8 @@ FROM openecomp/wildfly:1.0
### File Author / Maintainer
-MAINTAINER "The OpenECOMP Team"
-LABEL Description="This image contains the OpenECOMP MSO" Version="1.0"
+MAINTAINER "The ONAP Team"
+LABEL Description="This image contains the ONAP SO" Version="1.0"
ARG http_proxy
ARG https_proxy
diff --git a/packages/docker/src/main/docker/docker-files/Dockerfile.ubuntu-16.04-update b/packages/docker/src/main/docker/docker-files/Dockerfile.ubuntu-16.04-update
index 2e8f268f19..8ed710745a 100644
--- a/packages/docker/src/main/docker/docker-files/Dockerfile.ubuntu-16.04-update
+++ b/packages/docker/src/main/docker/docker-files/Dockerfile.ubuntu-16.04-update
@@ -1,7 +1,7 @@
FROM ubuntu:16.04
### File Author / Maintainer
-MAINTAINER "The OpenECOMP Team"
+MAINTAINER "The ONAP Team"
LABEL Description="This image contains an updated version of ubuntu 16.04" Version="1.0"
ARG http_proxy
diff --git a/packages/docker/src/main/docker/docker-files/Dockerfile.wildfly-10 b/packages/docker/src/main/docker/docker-files/Dockerfile.wildfly-10
index fff753217d..0e766e2658 100644
--- a/packages/docker/src/main/docker/docker-files/Dockerfile.wildfly-10
+++ b/packages/docker/src/main/docker/docker-files/Dockerfile.wildfly-10
@@ -1,8 +1,8 @@
FROM openecomp/ubuntu-update:1.0
### File Author / Maintainer
-MAINTAINER "The OpenECOMP Team"
-LABEL Description="This image contains OpenECOMP MSO ubuntu base" Version="1.0"
+MAINTAINER "The ONAP Team"
+LABEL Description="This image contains ONAP SO ubuntu base" Version="1.0"
ARG http_proxy
ARG https_proxy