Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Docker fedora 31 support #6

Closed
wants to merge 2 commits into from
Closed

Docker fedora 31 support #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9ab77f
Docker fedora 31 support
Tcharl Apr 5, 2020
240735d
update repository and sha
Tcharl Apr 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion roles/docker/meta/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ galaxy_info:
platforms:
- name: Fedora
versions:
- all
- 30
- 31
- name: EL
versions:
- 7
Expand Down
28 changes: 28 additions & 0 deletions roles/docker/molecule/vagrant-fedora-31/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
---
dependency:
name: galaxy
role-file: requirements.yml
driver:
name: vagrant
provider:
name: virtualbox
lint:
name: yamllint
platforms:
- name: docker-fedora-31
box: fedora/31-cloud-base
provisioner:
name: ansible
log: True
playbooks:
vagrant:
prepare: ../resources/playbooks/prepare.yml
converge: ../resources/playbooks/playbook.yml
verify: ../resources/playbooks/verify.yml
lint:
name: ansible-lint
verifier:
name: goss
directory: ../resources/tests
lint:
name: yamllint
4 changes: 2 additions & 2 deletions roles/docker/tasks/install_Fedora.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@

- name: Setup yum repository
get_url:
url: https://download.docker.com/linux/centos/docker-ce.repo
checksum: "sha256:6650718e0fe5202ae7618521f695d43a8bc051c539d7570f0edbfa5b4916f218"
url: https://download.docker.com/linux/fedora/docker-ce.repo
checksum: "sha256:3af973c1f2e16a032a11074eb22b440894ad4936c9ca86b666f8cf8342b7bea7"
dest: /etc/yum.repos.d/docker-ce.repo
mode: '0644'
become: yes
Expand Down
2 changes: 1 addition & 1 deletion roles/docker/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
when: ansible_facts['distribution'] == "CentOS" and ansible_facts['distribution_version']|int <= 7

- include: install_Fedora.yml
when: ansible_facts['distribution'] == "Fedora" and ansible_facts['distribution_version']|int == 30
when: ansible_facts['distribution'] == "Fedora" and ansible_facts['distribution_version']|int >= 30

- include: install_Ubuntu.yml
when: ansible_facts['distribution'] == "Ubuntu" and ansible_facts['distribution_version'] == "18.04"
Expand Down