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-vnc | |
| 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-vnc')
| -rw-r--r-- | base_sdc-vnc/Dockerfile | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/base_sdc-vnc/Dockerfile b/base_sdc-vnc/Dockerfile index b01357b..d24f319 100644 --- a/base_sdc-vnc/Dockerfile +++ b/base_sdc-vnc/Dockerfile @@ -1,17 +1,8 @@ FROM consol/ubuntu-xfce-vnc:1.3.0 -ARG HTTP_PROXY -ARG HTTPS_PROXY - -ENV HTTP_PROXY ${HTTP_PROXY} -ENV HTTPS_PROXY ${HTTPS_PROXY} - USER 0 -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 - -RUN apt-get -y update && apt-get -y install curl +RUN apt-get -y update && apt-get -y install curl=7.47.0-1ubuntu2.7 # install chef-solo RUN curl -L https://www.opscode.com/chef/install.sh | bash |