Merge pull request #3 from GeekOops/tidy

Tidy

README.md

@@ -4,7 +4,8 @@
 
 Configurable ansible role for setting up a nginx webserver on a Linux server. Works with
 
-- openSUSE Leap 15.2
+- openSUSE Leap 15.3
+- openSUSE Leap 15.4
 - Debian Buster
 
 ## Role Variables
@@ -33,7 +34,7 @@ Including an example of how to use your role (for instance, with variables passe
       roles:
          - { role: geekoops-nginx, config_firewall: true }
 
-A bit more advanced example for the imaginary `jellyfish` test server
+An advanced example for the imaginary `jellyfish` test server
 
     - hosts: jellyfish
       roles:
@@ -48,12 +49,6 @@ A bit more advanced example for the imaginary `jellyfish` test server
 
 MIT
 
-## Author Information
-
-phoenix
-
-Have a lot of fun!
-
 # Development
 
 ## Add githooks

molecule/default/Dockerfile.bullseye

@@ -0,0 +1,9 @@
+FROM docker.io/debian:bullseye
+
+# Install systemd, and development tools, clear cache and clean system
+RUN apt-get update && apt-get install -y systemd systemd-sysv python3 curl && rm -rf /var/cache/* && systemctl mask -- dev-hugepages.mount sys-fs-fuse-connections.mount && rm -f /etc/machine-id /var/lib/dbus/machine-id
+
+STOPSIGNAL SIGRTMIN+3
+
+# Start container with systemd
+ENTRYPOINT ["/sbin/init"]

molecule/default/Dockerfile.leap15_3

@@ -0,0 +1,7 @@
+FROM registry.opensuse.org/opensuse/leap:15.3
+
+# Install systemd and development tools, clear cache
+RUN zypper in -y systemd systemd-sysvinit firewalld python3 python3-firewall curl && rm -rf /var/cache/* && rm -f /etc/machine-id /var/lib/dbus/machine-id
+
+# Start container with systemd
+ENTRYPOINT ["/usr/sbin/init"]

molecule/default/Dockerfile.leap15_4

@@ -0,0 +1,7 @@
+FROM registry.opensuse.org/opensuse/leap:15.4
+
+# Install systemd and development tools, clear cache
+RUN zypper in -y systemd systemd-sysvinit firewalld python3 python3-firewall curl && rm -rf /var/cache/* && rm -f /etc/machine-id /var/lib/dbus/machine-id
+
+# Start container with systemd
+ENTRYPOINT ["/usr/sbin/init"]

molecule/default/molecule.yml

@@ -4,22 +4,30 @@ dependency:
 driver:
   name: docker
 platforms:
-  - name: leap
-    image: registry.opensuse.org/home/ph03nix/containers/containers/leap:ansible-leap
-    pre_build_image: true
+  - name: leap15_3
+    image: registry.opensuse.org/opensuse/leap:15.3
+    dockerfile: Dockerfile.leap15_3
+    command: ${MOLECULE_DOCKER_COMMAND:-"/usr/sbin/init"}
+    privileged: true
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+    tmpfs:
+      - /run
+      - /tmp
+  - name: leap15_4
+    image: registry.opensuse.org/opensuse/leap:15.4
+    dockerfile: Dockerfile.leap15_4
     command: ${MOLECULE_DOCKER_COMMAND:-"/usr/sbin/init"}
     privileged: true
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
-    capabilities:
-      - SYS_ADMIN
     tmpfs:
       - /run
       - /tmp
   - name: bullseye
-    image: grisu48/bullseye-ansible
-    pre_build_image: true
-    command: ${MOLECULE_DOCKER_COMMAND:-"/usr/sbin/init"}
+    image: docker.io/debian:bullseye
+    dockerfile: Dockerfile.bullseye
+    command: ${MOLECULE_DOCKER_COMMAND:-"/sbin/init"}
     privileged: true
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
@@ -32,7 +40,10 @@ provisioner:
   name: ansible
   inventory:
     host_vars:
-      leap:
+      leap15_3:
+        vhosts_dir: "/etc/nginx/vhosts.d"
+        deploy_nginx_config: true
+      leap15_4:
         vhosts_dir: "/etc/nginx/vhosts.d"
         deploy_nginx_config: true
       bullseye: