aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Lando <ml636r@att.com>2017-05-19 00:28:52 +0300
committerMichael Lando <ml636r@att.com>2017-05-19 00:28:52 +0300
commit706e7163031401ae4598c921b7b320a8875ae606 (patch)
treeb970979face0d052a0bfc9e130060265cb575669
parent885324e41e8dbc77605ef0cdd8991d03d9f88790 (diff)
update to cassandra docker file
Change-Id: Iefaae31ded89b1d0513fb0dd1a2784f38923581d Signed-off-by: Michael Lando <ml636r@att.com>
-rw-r--r--sdc-os-chef/sdc-cassandra/Dockerfile38
1 files changed, 4 insertions, 34 deletions
diff --git a/sdc-os-chef/sdc-cassandra/Dockerfile b/sdc-os-chef/sdc-cassandra/Dockerfile
index e2219c533d..29b1a2b94f 100644
--- a/sdc-os-chef/sdc-cassandra/Dockerfile
+++ b/sdc-os-chef/sdc-cassandra/Dockerfile
@@ -1,34 +1,7 @@
-FROM cassandra:2.1.16
+FROM cassandra:3
-ENV DEBIAN_FRONTEND noninteractive
-RUN apt-get -y update && apt-get -y install --no-install-recommends \
- apt-utils \
- 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
-
-RUN update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java
-ENV DEBIAN_FRONTEND teletype
+#ENV DEBIAN_FRONTEND noninteractive
+RUN apt-get -y update && apt-get -y install --no-install-recommends curl vim apt-utils
COPY chef-solo /root/chef-solo/
COPY chef-repo/cookbooks /root/chef-solo/cookbooks/
@@ -38,8 +11,5 @@ RUN curl -L https://omnitruck.chef.io/install.sh | bash
COPY startup.sh /root/
-
RUN chmod 770 /root/startup.sh
-
-ENTRYPOINT [ "/root/startup.sh" ]
-
+ENTRYPOINT [ "/root/startup.sh" ] \ No newline at end of file