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-centos6/Dockerfile | |
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-centos6/Dockerfile')
-rw-r--r-- | 1.9-centos6/Dockerfile | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/1.9-centos6/Dockerfile b/1.9-centos6/Dockerfile index dc450d6..f56f76f 100644 --- a/1.9-centos6/Dockerfile +++ b/1.9-centos6/Dockerfile | |||
@@ -26,12 +26,13 @@ RUN echo "===> Installing EPEL..." && \ | |||
26 | \ | 26 | \ |
27 | \ | 27 | \ |
28 | echo "===> Adding Ansible's prerequisites..." && \ | 28 | echo "===> Adding Ansible's prerequisites..." && \ |
29 | yum -y install gcc python-devel python-pip && \ | 29 | yum -y install gcc python-devel python-pip \ |
30 | libffi-devel openssl-devel && \ | ||
30 | pip install --upgrade pip && \ | 31 | pip install --upgrade pip && \ |
31 | \ | 32 | \ |
32 | \ | 33 | \ |
33 | echo "===> Installing Ansible..." && \ | 34 | echo "===> Installing Ansible..." && \ |
34 | pip install ansible==1.9.4 && \ | 35 | pip install --upgrade ansible==1.9.4 && \ |
35 | \ | 36 | \ |
36 | \ | 37 | \ |
37 | echo "===> Disabling sudo 'requiretty' setting..." && \ | 38 | echo "===> Disabling sudo 'requiretty' setting..." && \ |
@@ -39,7 +40,8 @@ RUN echo "===> Installing EPEL..." && \ | |||
39 | \ | 40 | \ |
40 | \ | 41 | \ |
41 | echo "===> Removing unused YUM resources..." && \ | 42 | echo "===> Removing unused YUM resources..." && \ |
42 | yum -y remove epel-release gcc python-devel python-pip && \ | 43 | yum -y remove epel-release gcc python-devel python-pip \ |
44 | libffi-devel openssl-devel || true && \ | ||
43 | yum clean all && \ | 45 | yum clean all && \ |
44 | \ | 46 | \ |
45 | \ | 47 | \ |