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.

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

Added Debian bullseye and bookworm in CI - updated galaxy meta info #155

Merged
merged 2 commits into from
Jan 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ galaxy_info:
- 8
- name: Debian
versions:
- buster
- bullseye
- buster
- bookworm
- name: Ubuntu
versions:
- bionic
- focal
- jammy
- name: FreeBSD
Expand Down
8 changes: 8 additions & 0 deletions molecule/pdns-rec-48/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,14 @@ platforms:
image: debian:10
dockerfile_tpl: debian-systemd

- name: debian-11
image: debian:11
dockerfile_tpl: debian-python3

- name: debian-12
image: debian:12
dockerfile_tpl: debian-python3

provisioner:
name: ansible
options:
Expand Down
8 changes: 8 additions & 0 deletions molecule/pdns-rec-49/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,14 @@ platforms:
image: debian:10
dockerfile_tpl: debian-systemd

- name: debian-11
image: debian:11
dockerfile_tpl: debian-python3

- name: debian-12
image: debian:12
dockerfile_tpl: debian-python3

provisioner:
name: ansible
options:
Expand Down
8 changes: 8 additions & 0 deletions molecule/pdns-rec-50/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,14 @@ platforms:
image: debian:10
dockerfile_tpl: debian-systemd

- name: debian-11
image: debian:11
dockerfile_tpl: debian-python3

- name: debian-12
image: debian:12
dockerfile_tpl: debian-python3

provisioner:
name: ansible
options:
Expand Down
8 changes: 8 additions & 0 deletions molecule/pdns-rec-master/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,14 @@ platforms:
image: debian:10
dockerfile_tpl: debian-systemd

- name: debian-11
image: debian:11
dockerfile_tpl: debian-python3

- name: debian-12
image: debian:12
dockerfile_tpl: debian-python3

provisioner:
name: ansible
options:
Expand Down
25 changes: 25 additions & 0 deletions molecule/resources/Dockerfile.debian-python3.j2
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Molecule managed

FROM {{ item.image }}

RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get upgrade -y && apt-get install -y systemd && apt-get clean; fi
RUN if [ ! -e /sbin/init ]; then ln -s /lib/systemd/systemd /sbin/init ; fi

ENV container docker

# Don't start the optional systemd services.
RUN find /etc/systemd/system \
/lib/systemd/system \
-path '*.wants/*' \
-not -name '*journald*' \
-not -name '*systemd-tmpfiles*' \
-not -name '*systemd-user-sessions*' \
-exec rm \{} \;

RUN systemctl set-default multi-user.target

VOLUME [ "/sys/fs/cgroup" ]

CMD ["/sbin/init"]

RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get upgrade -y && apt-get install -y python3 sudo bash net-tools ca-certificates && apt-get clean; fi
3 changes: 3 additions & 0 deletions molecule/resources/host_vars/debian-11.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---

ansible_python_interpreter: "/usr/bin/python3"
3 changes: 3 additions & 0 deletions molecule/resources/host_vars/debian-12.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---

ansible_python_interpreter: "/usr/bin/python3"