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-cqlsh | |
| 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-cqlsh')
| -rw-r--r-- | base_sdc-cqlsh/Dockerfile | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/base_sdc-cqlsh/Dockerfile b/base_sdc-cqlsh/Dockerfile index 41daef7..59e84eb 100644 --- a/base_sdc-cqlsh/Dockerfile +++ b/base_sdc-cqlsh/Dockerfile @@ -1,20 +1,7 @@ FROM openjdk:8-jdk-alpine -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 -RUN if [ ! -z ${HTTPS_PROXY} ]; then echo "Acquire::https::proxy \"${HTTPS_PROXY}\";" >> /etc/apt/apt.conf; fi - -RUN apk add --no-cache \ - py-pip - -RUN pip install cqlsh==4.0.1 - -# Install Chef -RUN set -ex && \ - apk add --no-cache bash build-base ruby ruby-dev libffi-dev libxml2-dev && \ - gem install chef berkshelf io-console --no-document +RUN apk add --no-cache py-pip && \ + pip install cqlsh==4.0.1 && \ + set -ex && \ + apk add --no-cache bash=4.4.19-r1 build-base=0.5-r0 ruby=2.4.4-r0 ruby-dev=2.4.4-r0 libffi-dev=3.2.1-r4 libxml2-dev=2.9.7-r0 && \ + gem install chef:13.8.5 berkshelf:6.3.1 io-console:0.4.6 --no-document |