From 97d48efeb67f4f7566752625ad3ce233f31985be Mon Sep 17 00:00:00 2001 From: William Yeh Date: Mon, 9 May 2016 16:34:32 +0800 Subject: Add: support for Ubuntu 16.04 LTS (Xenial). Fix: 1. OS-level packages `libffi-dev` and `libssl-dev`/`openssl-dev` should be installed explicitly since Ansible 2.0.2.0(???). 2. Python package cffi should be installed explicitly since Ansible 2.0.2.0(???). 3. add '--fix-missing' for apt. @see https://github.com/boxcutter/ubuntu/issues/62 @see https://github.com/pyca/cryptography/issues/2280 --- master-centos7-onbuild/Dockerfile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'master-centos7-onbuild') diff --git a/master-centos7-onbuild/Dockerfile b/master-centos7-onbuild/Dockerfile index 6d3fa21..24d4ca9 100644 --- a/master-centos7-onbuild/Dockerfile +++ b/master-centos7-onbuild/Dockerfile @@ -31,7 +31,7 @@ RUN echo "===> Enabling systemd..." && \ rm -f /lib/systemd/system/basic.target.wants/*; \ rm -f /lib/systemd/system/anaconda.target.wants/* && \ \ - \ + \ echo "===> Installing EPEL..." && \ yum -y install epel-release && \ yum -y update && \ @@ -45,6 +45,7 @@ RUN echo "===> Enabling systemd..." && \ yum -y install \ gcc make \ python python-devel python-pip \ + libffi-devel openssl-devel \ libxml2 libxml2-devel libxslt libxslt-devel \ git sudo curl && \ pip install --upgrade pip && \ @@ -73,10 +74,10 @@ RUN echo "===> Enabling systemd..." && \ sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/' /etc/sudoers && \ \ \ - echo "===> Removing unused YUM resources..." && \ - yum -y remove \ - epel-release python-devel python-pip gcc git && \ - yum clean all && \ + echo "===> Removing unused YUM resources..." && \ + yum -y remove epel-release gcc git python-devel python-pip \ + libffi-devel openssl-devel || true && \ + yum clean all && \ \ \ echo "===> Adding hosts for convenience..." && \ @@ -87,7 +88,7 @@ RUN echo "===> Enabling systemd..." && \ # # [Quote] https://hub.docker.com/_/centos/ # -# "In order to run a container with systemd, +# "In order to run a container with systemd, # you will need to mount the cgroups volumes from the host. # [...] # There have been reports that if you're using an Ubuntu host, -- cgit v1.2.3