Switch to podman for OS added recently

Signed-off-by: Christian König <ckoenig@posteo.de>
tests_systemd
Christian König 11 months ago
parent ea9b10cb5a
commit 10755e1cb3
No known key found for this signature in database

@ -1,5 +1,7 @@
FROM buildpack-deps:bookworm-scm
RUN apt-get update && apt-get -y --no-install-recommends install systemd systemd-sysv
ENV GITDIR /etc/.pihole
ENV SCRIPTDIR /opt/pihole
@ -14,4 +16,5 @@ RUN true && \
ENV SKIP_INSTALL true
ENV OS_CHECK_DOMAIN_NAME dev-supportedos.pi-hole.net
#sed '/# Start the installer/Q' /opt/pihole/basic-install.sh > /opt/pihole/stub_basic-install.sh && \
CMD ["/bin/systemd"]

@ -1,5 +1,5 @@
FROM fedora:38
RUN dnf install -y git initscripts
RUN dnf --setopt=install_weak_deps=False install -y git systemd
ENV GITDIR /etc/.pihole
ENV SCRIPTDIR /opt/pihole
@ -15,4 +15,4 @@ RUN true && \
ENV SKIP_INSTALL true
ENV OS_CHECK_DOMAIN_NAME dev-supportedos.pi-hole.net
#sed '/# Start the installer/Q' /opt/pihole/basic-install.sh > /opt/pihole/stub_basic-install.sh && \
CMD ["/usr/sbin/init"]

@ -1,5 +1,7 @@
FROM buildpack-deps:lunar-scm
RUN apt-get update && apt-get -y --no-install-recommends install systemd systemd-sysv
ENV GITDIR /etc/.pihole
ENV SCRIPTDIR /opt/pihole
@ -15,4 +17,4 @@ RUN true && \
ENV SKIP_INSTALL true
ENV OS_CHECK_DOMAIN_NAME dev-supportedos.pi-hole.net
#sed '/# Start the installer/Q' /opt/pihole/basic-install.sh > /opt/pihole/stub_basic-install.sh && \
CMD ["/bin/systemd"]

@ -2,7 +2,7 @@
envlist = py3
[testenv:py3]
allowlist_externals = docker
allowlist_externals = podman
deps = -rrequirements.txt
commands = docker buildx build --load --progress plain -f _debian_12.Dockerfile -t pytest_pihole:test_container ../
commands = podman buildx build --load --progress plain -f _debian_12.Dockerfile -t pytest_pihole:test_container ../
pytest {posargs:-vv -n auto} ./test_any_automated_install.py ./test_any_utils.py

@ -2,7 +2,7 @@
envlist = py3
[testenv]
allowlist_externals = docker
allowlist_externals = podman
deps = -rrequirements.txt
commands = docker buildx build --load --progress plain -f _fedora_38.Dockerfile -t pytest_pihole:test_container ../
commands = podman buildx build --load --progress plain -f _fedora_38.Dockerfile -t pytest_pihole:test_container ../
pytest {posargs:-vv -n auto} ./test_any_automated_install.py ./test_any_utils.py ./test_centos_fedora_common_support.py ./test_fedora_support.py

@ -2,7 +2,7 @@
envlist = py3
[testenv:py3]
allowlist_externals = docker
allowlist_externals = podman
deps = -rrequirements.txt
commands = docker buildx build --load --progress plain -f _ubuntu_23.Dockerfile -t pytest_pihole:test_container ../
commands = podman buildx build --load --progress plain -f _ubuntu_23.Dockerfile -t pytest_pihole:test_container ../
pytest {posargs:-vv -n auto} ./test_any_automated_install.py ./test_any_utils.py

Loading…
Cancel
Save