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 /master-centos6-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 'master-centos6-onbuild')
-rw-r--r-- | master-centos6-onbuild/Dockerfile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/master-centos6-onbuild/Dockerfile b/master-centos6-onbuild/Dockerfile index 4b8585d..091bad2 100644 --- a/master-centos6-onbuild/Dockerfile +++ b/master-centos6-onbuild/Dockerfile | |||
@@ -30,6 +30,7 @@ RUN echo "===> Installing EPEL..." && \ | |||
30 | yum -y install \ | 30 | yum -y install \ |
31 | gcc make \ | 31 | gcc make \ |
32 | python python-devel python-pip \ | 32 | python python-devel python-pip \ |
33 | libffi-devel openssl-devel \ | ||
33 | libxml2 libxml2-devel libxslt libxslt-devel \ | 34 | libxml2 libxml2-devel libxslt libxslt-devel \ |
34 | git sudo curl && \ | 35 | git sudo curl && \ |
35 | pip install --upgrade pip && \ | 36 | pip install --upgrade pip && \ |
@@ -58,9 +59,9 @@ RUN echo "===> Installing EPEL..." && \ | |||
58 | sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/' /etc/sudoers && \ | 59 | sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/' /etc/sudoers && \ |
59 | \ | 60 | \ |
60 | \ | 61 | \ |
61 | echo "===> Removing unused YUM resources..." && \ | 62 | echo "===> Removing unused YUM resources..." && \ |
62 | yum -y remove \ | 63 | yum -y remove epel-release gcc git python-devel python-pip \ |
63 | epel-release python-devel python-pip gcc git && \ | 64 | libffi-devel openssl-devel || true && \ |
64 | yum clean all && \ | 65 | yum clean all && \ |
65 | \ | 66 | \ |
66 | \ | 67 | \ |