Merge pull request #132 from npmdnl/npmdnl-ubuntu2204

Added ubuntu-2204 support to CI
PowerDNS · Jul 10, 2023 · 8c9f88d · 8c9f88d
2 parents 4c19b92 + b7707c1
commit 8c9f88d
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 8 deletions.
diff --git a/meta/main.yml b/meta/main.yml
@@ -21,6 +21,7 @@ galaxy_info:
       versions:
         - bionic
         - focal
+        - jammy
     - name: FreeBSD
       versions:
         - 11

diff --git a/molecule/pdns-rec-47/molecule.yml b/molecule/pdns-rec-47/molecule.yml
@@ -20,11 +20,15 @@ platforms:
 
   - name: ubuntu-1804
     image: ubuntu:18.04
-    dockerfile_tpl: debian-systemd
+    dockerfile_tpl: ubuntu-systemd
 
   - name: ubuntu-2004
     image: ubuntu:20.04
-    dockerfile_tpl: debian-systemd
+    dockerfile_tpl: ubuntu-systemd
+
+  - name: ubuntu-2204
+    image: ubuntu:22.04
+    dockerfile_tpl: ubuntu-systemd
 
   - name: debian-10
     image: debian:10

diff --git a/molecule/pdns-rec-48/molecule.yml b/molecule/pdns-rec-48/molecule.yml
@@ -20,11 +20,15 @@ platforms:
 
   - name: ubuntu-1804
     image: ubuntu:18.04
-    dockerfile_tpl: debian-systemd
+    dockerfile_tpl: ubuntu-systemd
 
   - name: ubuntu-2004
     image: ubuntu:20.04
-    dockerfile_tpl: debian-systemd
+    dockerfile_tpl: ubuntu-systemd
+
+  - name: ubuntu-2204
+    image: ubuntu:22.04
+    dockerfile_tpl: ubuntu-systemd
 
   - name: debian-10
     image: debian:10

diff --git a/molecule/pdns-rec-49/molecule.yml b/molecule/pdns-rec-49/molecule.yml
@@ -20,11 +20,15 @@ platforms:
 
   - name: ubuntu-1804
     image: ubuntu:18.04
-    dockerfile_tpl: debian-systemd
+    dockerfile_tpl: ubuntu-systemd
 
   - name: ubuntu-2004
     image: ubuntu:20.04
-    dockerfile_tpl: debian-systemd
+    dockerfile_tpl: ubuntu-systemd
+
+  - name: ubuntu-2204
+    image: ubuntu:22.04
+    dockerfile_tpl: ubuntu-systemd
 
   - name: debian-10
     image: debian:10

diff --git a/molecule/pdns-rec-master/molecule.yml b/molecule/pdns-rec-master/molecule.yml
@@ -20,11 +20,15 @@ platforms:
 
   - name: ubuntu-1804
     image: ubuntu:18.04
-    dockerfile_tpl: debian-systemd
+    dockerfile_tpl: ubuntu-systemd
 
   - name: ubuntu-2004
     image: ubuntu:20.04
-    dockerfile_tpl: debian-systemd
+    dockerfile_tpl: ubuntu-systemd
+
+  - name: ubuntu-2204
+    image: ubuntu:22.04
+    dockerfile_tpl: ubuntu-systemd
 
   - name: debian-10
     image: debian:10

diff --git a/molecule/resources/Dockerfile.ubuntu-systemd.j2 b/molecule/resources/Dockerfile.ubuntu-systemd.j2
@@ -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
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,6 +21,7 @@ galaxy_info: @@
           versions:
             - bionic
             - focal
+            - jammy
         - name: FreeBSD
           versions:
             - 11
@@ Expand Down @@