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 /centos7 | |
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 'centos7')
-rw-r--r-- | centos7/Dockerfile | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/centos7/Dockerfile b/centos7/Dockerfile index 0f2112d..6ea7e84 100644 --- a/centos7/Dockerfile +++ b/centos7/Dockerfile | |||
@@ -41,12 +41,13 @@ RUN echo "===> Enabling systemd..." && \ | |||
41 | \ | 41 | \ |
42 | \ | 42 | \ |
43 | echo "===> Adding Ansible's prerequisites..." && \ | 43 | echo "===> Adding Ansible's prerequisites..." && \ |
44 | yum -y install gcc python-devel python-pip && \ | 44 | yum -y install gcc python-devel python-pip \ |
45 | libffi-devel openssl-devel && \ | ||
45 | pip install --upgrade pip && \ | 46 | pip install --upgrade pip && \ |
46 | \ | 47 | \ |
47 | \ | 48 | \ |
48 | echo "===> Installing Ansible..." && \ | 49 | echo "===> Installing Ansible..." && \ |
49 | pip install ansible && \ | 50 | pip install --upgrade ansible && \ |
50 | \ | 51 | \ |
51 | \ | 52 | \ |
52 | echo "===> Disabling sudo 'requiretty' setting..." && \ | 53 | echo "===> Disabling sudo 'requiretty' setting..." && \ |
@@ -54,7 +55,8 @@ RUN echo "===> Enabling systemd..." && \ | |||
54 | \ | 55 | \ |
55 | \ | 56 | \ |
56 | echo "===> Removing unused YUM resources..." && \ | 57 | echo "===> Removing unused YUM resources..." && \ |
57 | yum -y remove epel-release gcc python-devel python-pip && \ | 58 | yum -y remove epel-release gcc python-devel python-pip \ |
59 | libffi-devel openssl-devel || true && \ | ||
58 | yum clean all && \ | 60 | yum clean all && \ |
59 | \ | 61 | \ |
60 | \ | 62 | \ |