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-centos6/Dockerfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'master-centos6') diff --git a/master-centos6/Dockerfile b/master-centos6/Dockerfile index d90a08b..8469d65 100644 --- a/master-centos6/Dockerfile +++ b/master-centos6/Dockerfile @@ -30,6 +30,7 @@ RUN echo "===> Installing EPEL..." && \ 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 && \ @@ -58,10 +59,10 @@ RUN echo "===> Installing EPEL..." && \ 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..." && \ -- cgit v1.2.3