diff options
| author |   Michael Lando <ml636r@att.com> | 2018-05-03 18:05:37 +0300 |
|---|---|---|
| committer | Michael Lando <ml636r@att.com> | 2018-05-03 18:05:37 +0300 |
| commit | c789e6fd5aaf3316ce640bbdeabcfcec6db84624 (patch) | |
| tree | 72bb0fd1f718c42c45846467b8d5bdab6701f8f8 /base_sdc-cassandra | |
| parent | 59d7583ae891fd9989b33c1f830da2a9c5befecc (diff) | |
fix merge failure
set all versions in the bases
Change-Id: I9e54a5b391c97c261045d8e6fca02aa84f926478
Issue-ID: SDC-1222
Signed-off-by: Michael Lando <ml636r@att.com>
Diffstat (limited to 'base_sdc-cassandra')
| -rw-r--r-- | base_sdc-cassandra/Dockerfile | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/base_sdc-cassandra/Dockerfile b/base_sdc-cassandra/Dockerfile index eb440f7..5251106 100644 --- a/base_sdc-cassandra/Dockerfile +++ b/base_sdc-cassandra/Dockerfile @@ -1,24 +1,14 @@ 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 \ - python +RUN apt-get -y update && \ + apt-get -y install --no-install-recommends \ + curl=7.38.0-4+deb8u10 \ + vim=2:7.4.488-7+deb8u3 \ + apt-utils=1.0.9.8.4 \ + openjdk-8-jdk=8u162-b12-1~bpo8+1 \ + python=2.7.9-1 RUN update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java -# install chef-solo RUN curl -L https://omnitruck.chef.io/install.sh | bash |