Geeko-Ops/geekoops-nginx
1
0
Fork 0
mirror of https://github.com/GeekOops/geekoops-nginx.git synced 2024-05-19 21:22:21 +00:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: Geeko-Ops:fe0f3cdad316cf98be7a50f12fb186640fa2d0f1
Branches Tags
Geeko-Ops:main
...
compare: Geeko-Ops:1e9acd55fea63bfc8db60fc5b8491dc3c30c01a0
Branches Tags
Geeko-Ops:main

5 commits
fe0f3cdad3 ... 1e9acd55fe

Author SHA1 Message Date
Felix Niederwanger 1e9acd55fe
Merge pull request #6 from GeekOops/deb 
Add bookworm
 2023-01-30 15:44:15 +01:00
Felix Niederwanger 94437a3bb2
Add bookworm 
Add the CI recipe for Debian bookworm
 2023-01-30 15:39:10 +01:00
Felix Niederwanger 88558167fa
Merge pull request #5 from GeekOops/molecule 
Fix Leap 15.4
 2023-01-30 15:34:13 +01:00
Felix Niederwanger 47db538daf
Fix Leap 15.4 
Fix the Leap 15.4 molecule test run

* Leave the machine-id file
* Switch to use `cgroupns: host` to make it run on GitHub again
 2023-01-30 15:10:42 +01:00
Felix Niederwanger 3bb759ccbf
Remove Leap 15.3 2023-01-30 11:44:27 +01:00
4 changed files with 24 additions and 32 deletions
Show stats Expand all files Collapse all files

9
molecule/default/Dockerfile.bookworm Normal file
View file

@ -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"]

7
molecule/default/Dockerfile.leap15_3
View file

@ -1,7 +0,0 @@
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"]

2
molecule/default/Dockerfile.leap15_4
View file

@ -1,7 +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
RUN zypper in -y systemd systemd-sysvinit firewalld python3 python3-firewall curl && rm -rf /var/cache/*
# Start container with systemd
ENTRYPOINT ["/usr/sbin/init"]

38
molecule/default/molecule.yml
View file

@ -4,23 +4,12 @@ dependency:
driver:
name: docker
platforms:
- 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
cgroupns: host
tmpfs:
- /run
- /tmp
@ -29,10 +18,16 @@ platforms:
dockerfile: Dockerfile.bullseye
command: ${MOLECULE_DOCKER_COMMAND:-"/sbin/init"}
privileged: true
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:ro
capabilities:
- SYS_ADMIN
cgroupns: host
tmpfs:
- /run
- /tmp
- name: bookworm
image: docker.io/debian:bookworm
dockerfile: Dockerfile.bookworm
command: ${MOLECULE_DOCKER_COMMAND:-"/sbin/init"}
privileged: true
cgroupns: host
tmpfs:
- /run
- /tmp
@ -40,19 +35,14 @@ provisioner:
name: ansible
inventory:
host_vars:
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:
vhosts_dir: "/etc/nginx/sites-enabled"
deploy_nginx_config: false
bookworm:
vhosts_dir: "/etc/nginx/sites-enabled"
deploy_nginx_config: false
verifier:
name: testinfra
lint:
name: flake8
lint: |
set -e
yamllint .