Skip to content

Commit

Permalink
Update to use fedora 41 (#28)
Browse files Browse the repository at this point in the history
* fix: update ansible on runner (for Fedora)
* fix: install gnupg2 for Fedora
  • Loading branch information
DrPsychick authored Oct 28, 2024
1 parent 6f8e93f commit 7a0b1a5
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 5 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ jobs:
path: "${{ github.repository }}"
- name: Check docker config
run: cat /etc/docker/daemon.json || echo; docker system info; docker version
- name: Check ansible
run: ansible --version
- name: Test
uses: gofrolist/molecule-action@v2
with:
Expand Down
7 changes: 4 additions & 3 deletions files/docker/Dockerfile_Fedora
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ ENV container=docker

STOPSIGNAL SIGRTMIN+3

RUN dnf -y install systemd openssh-server sudo \
&& dnf clean all
RUN dnf -y update \
&& dnf -y install python3 python3-libdnf5 systemd openssh-server sudo gnupg2 \
&& dnf clean all
# && (cd /lib/systemd/system/sysinit.target.wants/ ; for i in * ; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i ; done) ; \
# rm -f /lib/systemd/system/multi-user.target.wants/* ;\
# rm -f /etc/systemd/system/*.wants/* ;\
Expand All @@ -27,4 +28,4 @@ ENTRYPOINT ["/entrypoint.sh"]
# did not help: RUN sed -i -e 's#PrivateTmp=yes#PrivateTmp=no#' /lib/systemd/system/systemd-resolved.service
# did not help? check again! docker daemon.json: { "exec-opts": ["native.cgroupdriver=systemd"] }
# did not help: /sbin/init systemd.legacy_systemd_cgroup_controller
CMD ["/sbin/init"]
CMD ["/sbin/init"]
2 changes: 1 addition & 1 deletion molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ lint: |
ansible-lint
platforms:
- name: ubuntu2404
- name: fedora40
- name: fedora41
# - name: debian11
provisioner:
name: ansible
Expand Down
8 changes: 8 additions & 0 deletions molecule/default/prepare.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
---

- name: Install docker driver
hosts: all
tasks:
- name: Update ansible (fix for Fedora)
ansible.builtin.shell: |
pip3 install -U ansible
delegate_to: localhost
run_once: true
when: ansible_distribution == "Fedora"

- name: Install fuse-overlayfs
package:
name: fuse-overlayfs
Expand Down
2 changes: 1 addition & 1 deletion molecule/default/vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
work_dir: "/tmp/ansible-drpsychick.ansible_testing-default"
containers:
- { name: ubuntu2404, os: ubuntu, dockerfile: Dockerfile_Ubuntu, files: ["entrypoint.sh"], args: { VERSION: 24.04 } }
- { name: fedora40, os: fedora, dockerfile: Dockerfile_Fedora, files: ["entrypoint.sh"], args: { VERSION: 40 } }
- { name: fedora41, os: fedora, dockerfile: Dockerfile_Fedora, files: ["entrypoint.sh"], args: { VERSION: 41 } }
# - { name: debian11, os: ubuntu, dockerfile: Dockerfile_Debian, files: ["entrypoint.sh"], args: { VERSION: 11 } }
virtual_machines: []

0 comments on commit 7a0b1a5

Please sign in to comment.