X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=build%2Fdocker%2FDockerfile;h=41a555f6ca13566d1bf57962974c46d6f0cd58b6;hb=06bb603c88f8e3eb39d3539e3b73811d4bb0e435;hp=f3d122db9ca353fe7cc1be932d27b6b8244155e8;hpb=ce32b60906075b9471e9ebdb035998fd20afacc6;p=fuel.git

diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile
index f3d122db9..41a555f6c 100644
--- a/build/docker/Dockerfile
+++ b/build/docker/Dockerfile
@@ -13,25 +13,27 @@ FROM ubuntu:14.04
 ENV http_proxy INSERT_HTTP_PROXY
 ENV https_proxy INSERT_HTTPS_PROXY
 ENV no_proxy INSERT_NO_PROXY
+ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get update
 RUN apt-get install -y software-properties-common python-software-properties \
     make python-setuptools python-all dpkg-dev debhelper \
     fuseiso git genisoimage bind9-host wget curl lintian tmux lxc iptables \
-    ca-certificates sudo apt-utils lsb-release dosfstools debmirror
+    ca-certificates sudo apt-utils lsb-release dosfstools debmirror p7zip-full
 
 RUN echo "ALL ALL=NOPASSWD: ALL" > /etc/sudoers.d/open-sudo
 RUN echo "Defaults env_keep += \"ftp_proxy http_proxy https_proxy no_proxy RSYNC_PROXY RSYNC_CONNECT_PROG npm_config_registry\"" > /etc/sudoers.d/keep-proxies
 # Keeping PWD is needed to build as root
 RUN echo "Defaults env_keep += \"PWD\"" > /etc/sudoers.d/keep-pwd
+# Keeping variables for ISO build
+RUN echo "Defaults env_keep += \"MIRROR_UBUNTU MIRROR_UBUNTU_ROOT MIRROR_MOS_UBUNTU MIRROR_MOS_UBUNTU_ROOT MIRROR_FUEL LATEST_TARGET_UBUNTU\"" > /etc/sudoers.d/keep-mos
 RUN chmod 0440 /etc/sudoers.d/open-sudo
 RUN chmod 0440 /etc/sudoers.d/keep-proxies
 RUN chmod 0440 /etc/sudoers.d/keep-pwd
+RUN chmod 0440 /etc/sudoers.d/keep-mos
 RUN chmod 4755 /bin/fusermount
 
 ADD ./setcontext /root/setcontext
 RUN chmod +x /root/setcontext
-ADD ./enable_dockerx2 /root/enable_dockerx2
-RUN chmod +x /root/enable_dockerx2
 
 VOLUME /var/lib/docker