summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Lando <ml636r@att.com>2017-11-09 19:35:35 +0000
committerGerrit Code Review <gerrit@onap.org>2017-11-09 19:35:35 +0000
commit38c1e4c4ef5c948dd6cbf35c059bc302c1788fee (patch)
treef5e7fc7e06559bd6ce1ae8dfc3e7775bbb430133
parent97f28b8424428318088303a46273118854bc12b1 (diff)
parent93edecf667ec87d1a9f357604d0509eb20bf9093 (diff)
Merge "change base docker ver to release ver" into release-1.1.0
-rw-r--r--sdc-os-chef/pom.xml2
-rw-r--r--sdc-os-chef/sdc-backend/Dockerfile2
-rw-r--r--sdc-os-chef/sdc-cassandra/Dockerfile2
-rw-r--r--sdc-os-chef/sdc-elasticsearch/Dockerfile2
-rw-r--r--sdc-os-chef/sdc-frontend/Dockerfile2
-rw-r--r--sdc-os-chef/sdc-kibana/Dockerfile2
-rw-r--r--sdc-os-chef/sdc-sanity/Dockerfile2
-rw-r--r--utils/webseal-simulator/pom.xml2
-rw-r--r--utils/webseal-simulator/sdc-simulator/Dockerfile2
9 files changed, 9 insertions, 9 deletions
diff --git a/sdc-os-chef/pom.xml b/sdc-os-chef/pom.xml
index 9f833fdf47..896a75e503 100644
--- a/sdc-os-chef/pom.xml
+++ b/sdc-os-chef/pom.xml
@@ -334,7 +334,7 @@
<configuration>
<verbose>true</verbose>
<apiVersion>1.23</apiVersion>
- <registry>nexus3.onap.org:10003</registry>
+ <registry>nexus3.onap.org:10001</registry>
<authConfig>
<pull>
<username>docker</username>
diff --git a/sdc-os-chef/sdc-backend/Dockerfile b/sdc-os-chef/sdc-backend/Dockerfile
index e28a85d51e..ecd245a533 100644
--- a/sdc-os-chef/sdc-backend/Dockerfile
+++ b/sdc-os-chef/sdc-backend/Dockerfile
@@ -1,4 +1,4 @@
-FROM openecomp/base_sdc-backend:1.0.0-SNAPSHOT-latest
+FROM openecomp/base_sdc-backend:v1.0.0
COPY chef-solo /root/chef-solo/
diff --git a/sdc-os-chef/sdc-cassandra/Dockerfile b/sdc-os-chef/sdc-cassandra/Dockerfile
index 6066aeb453..27cbc92214 100644
--- a/sdc-os-chef/sdc-cassandra/Dockerfile
+++ b/sdc-os-chef/sdc-cassandra/Dockerfile
@@ -1,4 +1,4 @@
-FROM openecomp/base_sdc-cassandra:1.0.0-SNAPSHOT-latest
+FROM openecomp/base_sdc-cassandra:v1.0.0
COPY chef-solo /root/chef-solo/
diff --git a/sdc-os-chef/sdc-elasticsearch/Dockerfile b/sdc-os-chef/sdc-elasticsearch/Dockerfile
index 60db8e5b6b..4f1463dd82 100644
--- a/sdc-os-chef/sdc-elasticsearch/Dockerfile
+++ b/sdc-os-chef/sdc-elasticsearch/Dockerfile
@@ -1,4 +1,4 @@
-FROM openecomp/base_sdc-elasticsearch:1.0.0-SNAPSHOT-latest
+FROM openecomp/base_sdc-elasticsearch:v1.0.0
COPY chef-solo /root/chef-solo/
diff --git a/sdc-os-chef/sdc-frontend/Dockerfile b/sdc-os-chef/sdc-frontend/Dockerfile
index 5039b08034..2940a43286 100644
--- a/sdc-os-chef/sdc-frontend/Dockerfile
+++ b/sdc-os-chef/sdc-frontend/Dockerfile
@@ -1,4 +1,4 @@
-FROM openecomp/base_sdc-frontend:1.0.0-SNAPSHOT-latest
+FROM openecomp/base_sdc-frontend:v1.0.0
COPY chef-solo /root/chef-solo/
diff --git a/sdc-os-chef/sdc-kibana/Dockerfile b/sdc-os-chef/sdc-kibana/Dockerfile
index 6a058def0e..ccaa350ca4 100644
--- a/sdc-os-chef/sdc-kibana/Dockerfile
+++ b/sdc-os-chef/sdc-kibana/Dockerfile
@@ -1,4 +1,4 @@
-FROM openecomp/base_sdc-kibana:1.0.0-SNAPSHOT-latest
+FROM openecomp/base_sdc-kibana:v1.0.0
COPY chef-solo /root/chef-solo/
diff --git a/sdc-os-chef/sdc-sanity/Dockerfile b/sdc-os-chef/sdc-sanity/Dockerfile
index 38bf26641e..1dd064a585 100644
--- a/sdc-os-chef/sdc-sanity/Dockerfile
+++ b/sdc-os-chef/sdc-sanity/Dockerfile
@@ -1,4 +1,4 @@
-FROM openecomp/base_sdc-sanity:1.0.0-SNAPSHOT-latest
+FROM openecomp/base_sdc-sanity:v1.0.0
COPY chef-solo /root/chef-solo/
diff --git a/utils/webseal-simulator/pom.xml b/utils/webseal-simulator/pom.xml
index fb60abd82a..e240da6d01 100644
--- a/utils/webseal-simulator/pom.xml
+++ b/utils/webseal-simulator/pom.xml
@@ -208,7 +208,7 @@
<configuration>
<verbose>true</verbose>
<apiVersion>1.23</apiVersion>
- <registry>nexus3.onap.org:10003</registry>
+ <registry>nexus3.onap.org:10001</registry>
<authConfig>
<pull>
<username>docker</username>
diff --git a/utils/webseal-simulator/sdc-simulator/Dockerfile b/utils/webseal-simulator/sdc-simulator/Dockerfile
index e1a415f2ce..99fad58fe8 100644
--- a/utils/webseal-simulator/sdc-simulator/Dockerfile
+++ b/utils/webseal-simulator/sdc-simulator/Dockerfile
@@ -1,4 +1,4 @@
-FROM openecomp/base_sdc-frontend:1.0.0-SNAPSHOT-latest
+FROM openecomp/base_sdc-frontend:v1.0.0
COPY chef-solo /root/chef-solo/