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-debian8-onbuild/Dockerfile | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'master-debian8-onbuild/Dockerfile') diff --git a/master-debian8-onbuild/Dockerfile b/master-debian8-onbuild/Dockerfile index 19d4934..c9ce493 100644 --- a/master-debian8-onbuild/Dockerfile +++ b/master-debian8-onbuild/Dockerfile @@ -12,14 +12,17 @@ FROM debian:jessie MAINTAINER William Yeh -RUN echo "===> Adding Ansible's prerequisites..." && \ - apt-get update -y && \ +RUN echo "===> Adding Ansible's prerequisites..." && \ + apt-get update -y && apt-get install --fix-missing && \ DEBIAN_FRONTEND=noninteractive \ apt-get install --no-install-recommends -y -q \ build-essential ca-certificates \ python-pip python-dev python-yaml \ + libffi-dev libssl-dev \ libxml2-dev libxslt1-dev zlib1g-dev \ git sudo curl && \ + apt-get -y --purge remove python-cffi && \ + pip install --upgrade cffi && \ pip install --upgrade pyyaml jinja2 pycrypto && \ \ \ @@ -40,11 +43,11 @@ RUN echo "===> Adding Ansible's prerequisites..." && \ rm -rf /ansible && \ \ \ - echo "===> Clean up..." && \ + echo "===> Clean up..." && \ apt-get remove -y --auto-remove \ - build-essential python-pip python-dev git && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* && \ + build-essential python-pip python-dev git libffi-dev libssl-dev && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists/* && \ \ \ echo "===> Adding hosts for convenience..." && \ -- cgit v1.2.3