Merge branch 'fix/fedora' into 'master'

Install httpd for Fedora

See merge request packaging/rpm-icingaweb2!14
This commit is contained in:
Henrik Triem 2021-07-29 13:03:15 +00:00
commit 8c4e575b3e
2 changed files with 4 additions and 2 deletions

View File

@ -95,7 +95,6 @@ test/fedora/34:
<<: *test
variables:
DOCKER_IMAGE: fedora/34
allow_failure: true
dependencies:
- build/fedora/34
@ -113,7 +112,6 @@ test/fedora/33:
<<: *test
variables:
DOCKER_IMAGE: fedora/33
allow_failure: true
dependencies:
- build/fedora/33

View File

@ -11,6 +11,10 @@ if [ -f /etc/centos-release ] || grep -q 'ID="centos"' /etc/os-release; then
fi
fi
if [ -f /etc/fedora-release ]; then
sudo yum install -y httpd
fi
if [ -f /etc/os-release ]; then
source /etc/os-release
fi