[SDC] fix wrong variable in the chef script

[sdc.git] / sdc-os-chef / sdc-cassandra / Dockerfile

diff --git a/sdc-os-chef/sdc-cassandra/Dockerfile b/sdc-os-chef/sdc-cassandra/Dockerfile
index 7610ecb..3e9295d 100644 (file)
--- a/sdc-os-chef/sdc-cassandra/Dockerfile
+++ b/sdc-os-chef/sdc-cassandra/Dockerfile
@@ -1,44 +1,21 @@
-FROM cassandra:2.1.16
+FROM cassandra:2.1.17
 
-ENV DEBIAN_FRONTEND noninteractive
+#ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get -y update && apt-get -y install --no-install-recommends \
-    apt-utils \
-    curl \
+    curl   \
     vim \
-    default-jre \
-    && rm -rf /var/lib/apt/lists/*
-
-
-ENV JAVA_VERSION 8u121
-ENV JAVA_DEBIAN_VERSION 8u121-b13-1~bpo8+1
-
-# see https://bugs.debian.org/775775
-# and https://github.com/docker-library/java/issues/19#issuecomment-70546872
-ENV CA_CERTIFICATES_JAVA_VERSION 20161107~bpo8+1
-
-RUN set -x \
-       && apt-get update \
-       && apt-get install -y \
-               openjdk-8-jdk="$JAVA_DEBIAN_VERSION" \
-               ca-certificates-java="$CA_CERTIFICATES_JAVA_VERSION" \
-       && rm -rf /var/lib/apt/lists/*
-
-
-# see CA_CERTIFICATES_JAVA_VERSION notes above
-RUN /var/lib/dpkg/info/ca-certificates-java.postinst configure
+    apt-utils  \
+    openjdk-8-jdk
 
 RUN update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java
-ENV DEBIAN_FRONTEND teletype
 
 COPY chef-solo /root/chef-solo/
 COPY chef-repo/cookbooks /root/chef-solo/cookbooks/
 
 # install chef-solo
-RUN curl -L http://www.opscode.com/chef/install.sh | bash
+RUN curl -L https://omnitruck.chef.io/install.sh | bash
 
-COPY startup.sh /root/
 
+COPY startup.sh /root/
 RUN chmod 770 /root/startup.sh
-
 ENTRYPOINT [ "/root/startup.sh" ]
-