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-centos7-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-centos7-onbuild')
-rw-r--r-- | master-centos7-onbuild/Dockerfile | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/master-centos7-onbuild/Dockerfile b/master-centos7-onbuild/Dockerfile index 6d3fa21..24d4ca9 100644 --- a/master-centos7-onbuild/Dockerfile +++ b/master-centos7-onbuild/Dockerfile | |||
@@ -31,7 +31,7 @@ RUN echo "===> Enabling systemd..." && \ | |||
31 | rm -f /lib/systemd/system/basic.target.wants/*; \ | 31 | rm -f /lib/systemd/system/basic.target.wants/*; \ |
32 | rm -f /lib/systemd/system/anaconda.target.wants/* && \ | 32 | rm -f /lib/systemd/system/anaconda.target.wants/* && \ |
33 | \ | 33 | \ |
34 | \ | 34 | \ |
35 | echo "===> Installing EPEL..." && \ | 35 | echo "===> Installing EPEL..." && \ |
36 | yum -y install epel-release && \ | 36 | yum -y install epel-release && \ |
37 | yum -y update && \ | 37 | yum -y update && \ |
@@ -45,6 +45,7 @@ RUN echo "===> Enabling systemd..." && \ | |||
45 | yum -y install \ | 45 | yum -y install \ |
46 | gcc make \ | 46 | gcc make \ |
47 | python python-devel python-pip \ | 47 | python python-devel python-pip \ |
48 | libffi-devel openssl-devel \ | ||
48 | libxml2 libxml2-devel libxslt libxslt-devel \ | 49 | libxml2 libxml2-devel libxslt libxslt-devel \ |
49 | git sudo curl && \ | 50 | git sudo curl && \ |
50 | pip install --upgrade pip && \ | 51 | pip install --upgrade pip && \ |
@@ -73,10 +74,10 @@ RUN echo "===> Enabling systemd..." && \ | |||
73 | sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/' /etc/sudoers && \ | 74 | sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/' /etc/sudoers && \ |
74 | \ | 75 | \ |
75 | \ | 76 | \ |
76 | echo "===> Removing unused YUM resources..." && \ | 77 | echo "===> Removing unused YUM resources..." && \ |
77 | yum -y remove \ | 78 | yum -y remove epel-release gcc git python-devel python-pip \ |
78 | epel-release python-devel python-pip gcc git && \ | 79 | libffi-devel openssl-devel || true && \ |
79 | yum clean all && \ | 80 | yum clean all && \ |
80 | \ | 81 | \ |
81 | \ | 82 | \ |
82 | echo "===> Adding hosts for convenience..." && \ | 83 | echo "===> Adding hosts for convenience..." && \ |
@@ -87,7 +88,7 @@ RUN echo "===> Enabling systemd..." && \ | |||
87 | # | 88 | # |
88 | # [Quote] https://hub.docker.com/_/centos/ | 89 | # [Quote] https://hub.docker.com/_/centos/ |
89 | # | 90 | # |
90 | # "In order to run a container with systemd, | 91 | # "In order to run a container with systemd, |
91 | # you will need to mount the cgroups volumes from the host. | 92 | # you will need to mount the cgroups volumes from the host. |
92 | # [...] | 93 | # [...] |
93 | # There have been reports that if you're using an Ubuntu host, | 94 | # There have been reports that if you're using an Ubuntu host, |