diff options
| author |   shuai chen <chenshuai@huawei.com> | 2016-08-19 08:03:05 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-08-19 08:03:06 +0000 |
| commit | dfa5128cfb407eaf4d1fe93404d3b423e26d8c8b (patch) | |
| tree | da5ab8fcab40ae077fb9ca2cc01aea7b77effb33 /build/jhenv_template/ubuntu | |
| parent | d74aefc2d04b69a8a0a74af3f4e3114020ca748e (diff) | |
| parent | 00214a8cf06840cf5be6427d3c8d0ba84a7a1069 (diff) | |
Merge "Revert "Prepare the jump host offline""
Diffstat (limited to 'build/jhenv_template/ubuntu')
| -rw-r--r-- | build/jhenv_template/ubuntu/trusty/Dockerfile | 35 | ||||
| -rw-r--r-- | build/jhenv_template/ubuntu/xenial/Dockerfile | 35 |
2 files changed, 0 insertions, 70 deletions
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 <xueyifei@huawei.com> - -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 <xueyifei@huawei.com> - -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"] |