summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Lando <ml636r@att.com>2017-02-22 14:27:44 +0000
committerGerrit Code Review <gerrit@openecomp.org>2017-02-22 14:27:44 +0000
commitb497ed09bb1e45291248cbff7867a8eb2770a282 (patch)
treeb72b5ea88e818d7801cf85256653589935b3b4a6
parenta90804db040ed39e7541b8778c283a25b18d31b8 (diff)
parentf79a5d16b6c089ed6030c745f61b0c651e7bbde2 (diff)
Merge "copy chef-install.sh into docker"
-rw-r--r--sdc-os-chef/sdc-backend/Dockerfile4
-rw-r--r--sdc-os-chef/sdc-cassandra/Dockerfile5
-rw-r--r--sdc-os-chef/sdc-elasticsearch/Dockerfile4
-rw-r--r--sdc-os-chef/sdc-frontend/Dockerfile4
-rw-r--r--sdc-os-chef/sdc-kibana/Dockerfile4
-rw-r--r--sdc-os-chef/sdc-sanity/Dockerfile4
6 files changed, 19 insertions, 6 deletions
diff --git a/sdc-os-chef/sdc-backend/Dockerfile b/sdc-os-chef/sdc-backend/Dockerfile
index 47ca00eaa5..d68b59078a 100644
--- a/sdc-os-chef/sdc-backend/Dockerfile
+++ b/sdc-os-chef/sdc-backend/Dockerfile
@@ -15,7 +15,9 @@ RUN pip install pycurl
# install chef-solo
#RUN curl -L http://www.opscode.com/chef/install.sh | bash
-RUN bash chef-install.sh
+COPY chef-install.sh /root/
+RUN chmod 770 /root/chef-install.sh
+RUN bash /root/chef-install.sh
ADD onboarding-be-__SDC-RELEASE__.war ${JETTY_BASE}/webapps/
ADD catalog-be-__SDC-RELEASE__.war ${JETTY_BASE}/webapps/
diff --git a/sdc-os-chef/sdc-cassandra/Dockerfile b/sdc-os-chef/sdc-cassandra/Dockerfile
index e2aca801cb..d8bc0b472e 100644
--- a/sdc-os-chef/sdc-cassandra/Dockerfile
+++ b/sdc-os-chef/sdc-cassandra/Dockerfile
@@ -35,7 +35,10 @@ COPY chef-repo/cookbooks /root/chef-solo/cookbooks/
# install chef-solo
#RUN curl -L http://www.opscode.com/chef/install.sh | bash
-RUN bash chef-install.sh
+COPY chef-install.sh /root/
+RUN chmod 770 /root/chef-install.sh
+RUN bash /root/chef-install.sh
+
COPY startup.sh /root/
RUN chmod 770 /root/startup.sh
diff --git a/sdc-os-chef/sdc-elasticsearch/Dockerfile b/sdc-os-chef/sdc-elasticsearch/Dockerfile
index 192c728228..92821e58ae 100644
--- a/sdc-os-chef/sdc-elasticsearch/Dockerfile
+++ b/sdc-os-chef/sdc-elasticsearch/Dockerfile
@@ -13,7 +13,9 @@ ENV BASE_NEXUS zl999y:ChangeMe@10.208.197.75:8443/repository/maven-public/org/op
# install chef-solo
#RUN curl -L http://www.opscode.com/chef/install.sh | bash
-RUN bash chef-install.sh
+COPY chef-install.sh /root/
+RUN chmod 770 /root/chef-install.sh
+RUN bash /root/chef-install.sh
COPY startup.sh /root/
diff --git a/sdc-os-chef/sdc-frontend/Dockerfile b/sdc-os-chef/sdc-frontend/Dockerfile
index 3ce093ef95..940dd2341e 100644
--- a/sdc-os-chef/sdc-frontend/Dockerfile
+++ b/sdc-os-chef/sdc-frontend/Dockerfile
@@ -10,7 +10,9 @@ COPY chef-repo/cookbooks /root/chef-solo/cookbooks/
# install chef-solo
#RUN curl -L http://www.opscode.com/chef/install.sh | bash
-RUN bash chef-install.sh
+COPY chef-install.sh /root/
+RUN chmod 770 /root/chef-install.sh
+RUN bash /root/chef-install.sh
RUN cp ${JETTY_HOME}/resources/log4j.properties ${JETTY_BASE}/resources/log4j.properties
diff --git a/sdc-os-chef/sdc-kibana/Dockerfile b/sdc-os-chef/sdc-kibana/Dockerfile
index 87fb26d88f..6428931121 100644
--- a/sdc-os-chef/sdc-kibana/Dockerfile
+++ b/sdc-os-chef/sdc-kibana/Dockerfile
@@ -10,7 +10,9 @@ COPY chef-repo/cookbooks/. /root/chef-solo/cookbooks/
# install chef-solo
#RUN curl -L http://www.opscode.com/chef/install.sh | bash
-run bash chef-install.sh
+COPY chef-install.sh /root/
+RUN chmod 770 /root/chef-install.sh
+RUN bash /root/chef-install.sh
COPY startup.sh /root/
diff --git a/sdc-os-chef/sdc-sanity/Dockerfile b/sdc-os-chef/sdc-sanity/Dockerfile
index 78a8c695f5..be629760bf 100644
--- a/sdc-os-chef/sdc-sanity/Dockerfile
+++ b/sdc-os-chef/sdc-sanity/Dockerfile
@@ -12,7 +12,9 @@ COPY chef-repo/cookbooks/. /root/chef-solo/cookbooks/
# install chef-solo
#RUN curl -L http://www.opscode.com/chef/install.sh | bash
-RUN bash chef-install.sh
+COPY chef-install.sh /root/
+RUN chmod 770 /root/chef-install.sh
+RUN bash /root/chef-install.sh
COPY startup.sh /root/