diff options
| author |   Areli Fuss <af732p@att.com> | 2017-09-11 10:27:29 +0300 |
|---|---|---|
| committer | Areli Fuss <af732p@att.com> | 2017-09-11 10:31:28 +0300 |
| commit | 0a89f59cda65da8f64bd5faf12cf6abb28386aeb (patch) | |
| tree | 8319bc8ed294342ee1ca7c15ba53ce0e637255e3 /sdc-os-chef/sdc-cassandra | |
| parent | 3fdfcedf215e4e93a2b603fca20b4fbac8b491e3 (diff) | |
Replace baselines of SDC dockers
Replace the FROM definition to include
SDB baseline dockers and clean relevant
commands
Change-Id: I0d8659d80daef8a1abb6213f7d4d469e46a37862
Issue-Id: SDC-306
Signed-off-by: Areli Fuss <af732p@att.com>
Diffstat (limited to 'sdc-os-chef/sdc-cassandra')
| -rw-r--r-- | sdc-os-chef/sdc-cassandra/Dockerfile | 27 |
1 files changed, 4 insertions, 23 deletions
diff --git a/sdc-os-chef/sdc-cassandra/Dockerfile b/sdc-os-chef/sdc-cassandra/Dockerfile index 7af6de1de4..6066aeb453 100644 --- a/sdc-os-chef/sdc-cassandra/Dockerfile +++ b/sdc-os-chef/sdc-cassandra/Dockerfile @@ -1,30 +1,11 @@ -FROM cassandra:2.1.17 - -ARG HTTP_PROXY -ARG HTTPS_PROXY - -ENV HTTP_PROXY ${HTTP_PROXY} -ENV HTTPS_PROXY ${HTTPS_PROXY} - -RUN if [ ! -z ${HTTP_PROXY} ]; then echo "Acquire::http::proxy \"${HTTP_PROXY}\";" >> /etc/apt/apt.conf; fi && \ - if [ ! -z ${HTTPS_PROXY} ]; then echo "Acquire::https::proxy \"${HTTPS_PROXY}\";" >> /etc/apt/apt.conf; fi - -#ENV DEBIAN_FRONTEND noninteractive -RUN apt-get -y update && apt-get -y install --no-install-recommends \ - curl \ - vim \ - apt-utils \ - openjdk-8-jdk - -RUN update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java +FROM openecomp/base_sdc-cassandra:1.0.0-SNAPSHOT-latest COPY chef-solo /root/chef-solo/ -COPY chef-repo/cookbooks /root/chef-solo/cookbooks/ - -# install chef-solo -RUN curl -L https://omnitruck.chef.io/install.sh | bash +COPY chef-repo/cookbooks /root/chef-solo/cookbooks/ COPY startup.sh /root/ + RUN chmod 770 /root/startup.sh + ENTRYPOINT [ "/root/startup.sh" ] |