Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
A
ansible-role-certbot
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Calyx Institute
CalyxOS
ansible-role-certbot
Commits
c762892b
Commit
c762892b
authored
Jul 11, 2016
by
Jeff Geerling
Browse files
Options
Downloads
Patches
Plain Diff
Fix broken CentOS tests; 'DistributionNotFound: jinja2'.
parent
65071dd9
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
tests/Dockerfile.centos-6
+1
-5
1 addition, 5 deletions
tests/Dockerfile.centos-6
tests/Dockerfile.centos-7
+2
-4
2 additions, 4 deletions
tests/Dockerfile.centos-7
with
3 additions
and
9 deletions
tests/Dockerfile.centos-6
+
1
−
5
View file @
c762892b
...
@@ -3,17 +3,13 @@ FROM centos:6
...
@@ -3,17 +3,13 @@ FROM centos:6
# Install Ansible
# Install Ansible
RUN
yum
-y
update
;
yum clean all
;
RUN
yum
-y
update
;
yum clean all
;
RUN
yum
-y
install
epel-release
RUN
yum
-y
install
epel-release
RUN
yum
-y
install
git
python-setuptools gcc
sudo
libffi-devel python-devel openssl-devel
RUN
yum
-y
install
git
ansible
sudo
RUN
yum clean all
RUN
yum clean all
RUN
easy_install pip
RUN
pip
install
ansible
# Disable requiretty
# Disable requiretty
RUN
sed
-i
-e
's/^\(Defaults\s*requiretty\)/#--- \1/'
/etc/sudoers
RUN
sed
-i
-e
's/^\(Defaults\s*requiretty\)/#--- \1/'
/etc/sudoers
# Install Ansible inventory file
# Install Ansible inventory file
RUN
mkdir
- p /etc/ansible
RUN
echo
-e
'[local]\nlocalhost ansible_connection=local'
>
/etc/ansible/hosts
RUN
echo
-e
'[local]\nlocalhost ansible_connection=local'
>
/etc/ansible/hosts
CMD
["/usr/sbin/init"]
CMD
["/usr/sbin/init"]
This diff is collapsed.
Click to expand it.
tests/Dockerfile.centos-7
+
2
−
4
View file @
c762892b
...
@@ -13,16 +13,14 @@ rm -f /lib/systemd/system/basic.target.wants/*; \
...
@@ -13,16 +13,14 @@ rm -f /lib/systemd/system/basic.target.wants/*; \
rm
-f
/lib/systemd/system/anaconda.target.wants/
*
;
rm
-f
/lib/systemd/system/anaconda.target.wants/
*
;
# Install Ansible
# Install Ansible
RUN
yum
-y
install
git python-setuptools gcc
sudo
libffi-devel python-devel openssl-devel
RUN
yum
-y
install
epel-release
RUN
yum
-y
install
git ansible
sudo
RUN
yum clean all
RUN
yum clean all
RUN
easy_install pip
RUN
pip
install
ansible
# Disable requiretty
# Disable requiretty
RUN
sed
-i
-e
's/^\(Defaults\s*requiretty\)/#--- \1/'
/etc/sudoers
RUN
sed
-i
-e
's/^\(Defaults\s*requiretty\)/#--- \1/'
/etc/sudoers
# Install Ansible inventory file
# Install Ansible inventory file
RUN
mkdir
- p /etc/ansible
RUN
echo
-e
'[local]\nlocalhost ansible_connection=local'
>
/etc/ansible/hosts
RUN
echo
-e
'[local]\nlocalhost ansible_connection=local'
>
/etc/ansible/hosts
VOLUME
["/sys/fs/cgroup"]
VOLUME
["/sys/fs/cgroup"]
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment