From 00214a8cf06840cf5be6427d3c8d0ba84a7a1069 Mon Sep 17 00:00:00 2001 From: Yifei Xue Date: Fri, 19 Aug 2016 04:05:36 +0000 Subject: Revert "Prepare the jump host offline" This reverts commit b7058b4b3f823cf4c95c38741dddc68b59b733cc. Change-Id: I77437a15a0a0c47f768de30eaf7f37cf73f028fb Signed-off-by: Yifei Xue --- build/jhenv_template/ubuntu/trusty/Dockerfile | 35 --------------------------- build/jhenv_template/ubuntu/xenial/Dockerfile | 35 --------------------------- 2 files changed, 70 deletions(-) delete mode 100644 build/jhenv_template/ubuntu/trusty/Dockerfile delete mode 100644 build/jhenv_template/ubuntu/xenial/Dockerfile (limited to 'build/jhenv_template/ubuntu') diff --git a/build/jhenv_template/ubuntu/trusty/Dockerfile b/build/jhenv_template/ubuntu/trusty/Dockerfile deleted file mode 100644 index 650d763c..00000000 --- a/build/jhenv_template/ubuntu/trusty/Dockerfile +++ /dev/null @@ -1,35 +0,0 @@ -FROM ubuntu:14.04.3 -MAINTAINER Yifei Xue - -ADD ./cp_env.sh /cp_env.sh - -RUN apt-get update - -RUN apt-get install -y -d mkisofs bc curl ipmitool openvswitch-switch \ -git python-pip python-dev figlet \ -libxslt-dev libxml2-dev libvirt-dev \ -build-essential qemu-utils qemu-kvm libvirt-bin \ -virtinst libmysqld-dev \ -libssl-dev libffi-dev python-cffi - -RUN mkdir jh_deb - -RUN cp /var/cache/apt/archives/*.deb jh_deb/ - -RUN tar -zcvf env_trusty_deb.tar.gz jh_deb/ - -RUN apt-get install -y python-pip - -RUN mkdir jh_pip - -RUN pip install --upgrade markupsafe virtualenv cheetah pyyaml requests netaddr pbr oslo.config ansible -d jh_pip/ - -RUN tar -zcvf env_trusty_pip.tar.gz jh_pip/ - -RUN mkdir -p /home/tmp - -RUN cp *.tar.gz /home/tmp - -RUN chmod +x /cp_env.sh - -CMD ["/cp_env.sh"] diff --git a/build/jhenv_template/ubuntu/xenial/Dockerfile b/build/jhenv_template/ubuntu/xenial/Dockerfile deleted file mode 100644 index f70586ea..00000000 --- a/build/jhenv_template/ubuntu/xenial/Dockerfile +++ /dev/null @@ -1,35 +0,0 @@ -FROM ubuntu:16.04 -MAINTAINER Yifei Xue - -ADD ./cp_env.sh /cp_env.sh - -RUN apt-get update - -RUN apt-get install -y -d mkisofs bc curl ipmitool openvswitch-switch \ -git python-pip python-dev figlet \ -libxslt-dev libxml2-dev libvirt-dev \ -build-essential qemu-utils qemu-kvm libvirt-bin \ -virtinst libmysqld-dev \ -libssl-dev libffi-dev python-cffi - -RUN mkdir jh_deb - -RUN cp /var/cache/apt/archives/*.deb jh_deb/ - -RUN tar -zcvf env_xenial_deb.tar.gz jh_deb/ - -RUN apt-get install -y python-pip - -RUN mkdir jh_pip - -RUN pip install --upgrade markupsafe virtualenv cheetah pyyaml requests netaddr pbr oslo.config ansible -d jh_pip/ - -RUN tar -zcvf env_xenial_pip.tar.gz jh_pip/ - -RUN mkdir -p /home/tmp - -RUN cp *.tar.gz /home/tmp - -RUN chmod +x /cp_env.sh - -CMD ["/cp_env.sh"] -- cgit 1.2.3-korg