Skip to content

Commit

Permalink
Merge branch 'master' into 30-add-support-for-alpine-linux-3164
Browse files Browse the repository at this point in the history
  • Loading branch information
kirill-zak committed Apr 7, 2023
2 parents d13e567 + 989ae58 commit 5f0b3a1
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 7 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ jobs:

matrix:
distr:
- geerlingguy/docker-centos7
- geerlingguy/docker-centos8
- geerlingguy/docker-debian10
- geerlingguy/docker-debian11
Expand Down Expand Up @@ -77,7 +76,7 @@ jobs:
python-version: '3.x'

- name: Install test dependencies
run: pip3 install ansible molecule[docker] docker yamllint ansible-lint
run: pip3 install ansible molecule[podman] podman yamllint ansible-lint

- name: Run Molecule tests
run: molecule test
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ jobs:

matrix:
distr:
- geerlingguy/docker-centos7
- geerlingguy/docker-centos8
- geerlingguy/docker-debian10
- geerlingguy/docker-debian11
Expand Down Expand Up @@ -76,7 +75,7 @@ jobs:
python-version: '3.x'

- name: Install test dependencies
run: pip3 install ansible molecule[docker] docker yamllint ansible-lint
run: pip3 install ansible molecule[podman] podman yamllint ansible-lint

- name: Run Molecule tests
run: molecule test
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ An Ansible role that installs the latest version of Docker CE on the official in
* AlmaLinux 9
* Alpine Linux 3.16.x (3.16.0, 3.16.1, 3.16.2, 3.16.3, 3.16.4)
* Alpine Linux 3.17.x (3.17.0)
* CentOS 7
* CentOS 8
* Debian 10 (Buster)
* Debian 11 (Bullseye)
Expand Down
1 change: 0 additions & 1 deletion meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ galaxy_info:
- bullseye
- name: EL
versions:
- "7"
- "8"
- name: Fedora
versions:
Expand Down
2 changes: 1 addition & 1 deletion molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ lint: |
yamllint .
ansible-lint .
driver:
name: docker
name: podman
platforms:
- name: instance
image: "${MOLECULE_DISTR:-geerlingguy/docker-ubuntu2204}-ansible:${MOLECULE_TAG:-latest}"
Expand Down

0 comments on commit 5f0b3a1

Please sign in to comment.