From f79a5d16b6c089ed6030c745f61b0c651e7bbde2 Mon Sep 17 00:00:00 2001 From: Grinberg Moti Date: Wed, 22 Feb 2017 15:36:03 +0200 Subject: copy chef-install.sh into docker Change-Id: I2a7517c3760b1b5a7701941804153d7a8d78454a Signed-off-by: Grinberg Moti --- sdc-os-chef/sdc-backend/Dockerfile | 4 +++- sdc-os-chef/sdc-cassandra/Dockerfile | 5 ++++- sdc-os-chef/sdc-elasticsearch/Dockerfile | 4 +++- sdc-os-chef/sdc-frontend/Dockerfile | 4 +++- sdc-os-chef/sdc-kibana/Dockerfile | 4 +++- sdc-os-chef/sdc-sanity/Dockerfile | 4 +++- 6 files changed, 19 insertions(+), 6 deletions(-) (limited to 'sdc-os-chef') 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/ -- cgit 1.2.3-korg