fix merge failure

[sdc/sdc-docker-base.git] / base_sdc-vnc / Dockerfile

diff --git a/base_sdc-vnc/Dockerfile b/base_sdc-vnc/Dockerfile
index b01357b..d24f319 100644 (file)
--- 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