diff options
author | William Yeh <william.pjyeh@gmail.com> | 2016-05-09 16:34:32 +0800 |
---|---|---|
committer | William Yeh <william.pjyeh@gmail.com> | 2016-05-10 17:17:33 +0800 |
commit | 97d48efeb67f4f7566752625ad3ce233f31985be (patch) | |
tree | 20ce7984d99bf5f6b770fce81384790027723517 /1.9-debian7-onbuild | |
parent | b314855954aa117b1294056891d16f43a6b1b9d0 (diff) | |
download | docker-ansible-97d48efeb67f4f7566752625ad3ce233f31985be.tar.gz docker-ansible-97d48efeb67f4f7566752625ad3ce233f31985be.tar.zst docker-ansible-97d48efeb67f4f7566752625ad3ce233f31985be.zip |
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
Diffstat (limited to '1.9-debian7-onbuild')
-rw-r--r-- | 1.9-debian7-onbuild/Dockerfile | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/1.9-debian7-onbuild/Dockerfile b/1.9-debian7-onbuild/Dockerfile index 5ca7ce3..ec8f2d1 100644 --- a/1.9-debian7-onbuild/Dockerfile +++ b/1.9-debian7-onbuild/Dockerfile | |||
@@ -13,11 +13,12 @@ MAINTAINER William Yeh <william.pjyeh@gmail.com> | |||
13 | 13 | ||
14 | 14 | ||
15 | RUN echo "===> Installing python, sudo, and supporting tools..." && \ | 15 | RUN echo "===> Installing python, sudo, and supporting tools..." && \ |
16 | apt-get update && \ | 16 | apt-get update -y && apt-get install --fix-missing && \ |
17 | DEBIAN_FRONTEND=noninteractive \ | 17 | DEBIAN_FRONTEND=noninteractive \ |
18 | apt-get install -y \ | 18 | apt-get install -y \ |
19 | python python-yaml sudo \ | 19 | python python-yaml sudo \ |
20 | curl gcc python-pip python-dev && \ | 20 | curl gcc python-pip python-dev libffi-dev libssl-dev && \ |
21 | pip install --upgrade cffi && \ | ||
21 | \ | 22 | \ |
22 | \ | 23 | \ |
23 | echo "===> Installing Ansible..." && \ | 24 | echo "===> Installing Ansible..." && \ |
@@ -25,7 +26,8 @@ RUN echo "===> Installing python, sudo, and supporting tools..." && \ | |||
25 | \ | 26 | \ |
26 | \ | 27 | \ |
27 | echo "===> Removing unused APT resources..." && \ | 28 | echo "===> Removing unused APT resources..." && \ |
28 | apt-get -f -y --auto-remove remove gcc python-pip python-dev && \ | 29 | apt-get -f -y --auto-remove remove \ |
30 | gcc python-pip python-dev libffi-dev libssl-dev && \ | ||
29 | apt-get clean && \ | 31 | apt-get clean && \ |
30 | rm -rf /var/lib/apt/lists/* /tmp/* && \ | 32 | rm -rf /var/lib/apt/lists/* /tmp/* && \ |
31 | \ | 33 | \ |