Browse Source

Support centos8

pull/575/head
Tim Kimber 5 years ago
parent
commit
8499616128
No known key found for this signature in database GPG Key ID: 3E1804964E76BD18
3 changed files with 22 additions and 2 deletions
  1. +20
    -0
      test/Dockerfile-centos8
  2. +1
    -1
      test/restart-nginx
  3. +1
    -1
      test/test_helper.bash

+ 20
- 0
test/Dockerfile-centos8 View File

@ -0,0 +1,20 @@
FROM centos:centos8
# Note this image uses drill, does not have dig or nslookup installed
# Update and install required software
RUN yum -y update
RUN yum -y install epel-release
RUN yum -y install git curl bind-utils wget which nginx
WORKDIR /root
RUN mkdir /etc/nginx/pki
RUN mkdir /etc/nginx/pki/private
COPY ./test/test-config/nginx-ubuntu-no-ssl /etc/nginx/conf.d/default.conf
COPY ./test/test-config/nginx-centos7.conf /etc/nginx/nginx.conf
# BATS (Bash Automated Testings)
RUN git clone https://github.com/bats-core/bats-core.git /bats-core
RUN git clone https://github.com/bats-core/bats-support /bats-support
RUN git clone https://github.com/bats-core/bats-assert /bats-assert
RUN /bats-core/install.sh /usr/local

+ 1
- 1
test/restart-nginx View File

@ -3,7 +3,7 @@
if [ "$GETSSL_OS" = "alpine" ]; then if [ "$GETSSL_OS" = "alpine" ]; then
killall -HUP nginx >&3- killall -HUP nginx >&3-
sleep 5 sleep 5
elif [ "$GETSSL_OS" == "centos7" ]; then
elif [[ "$GETSSL_OS" == "centos"[78] ]]; then
pgrep nginx | head -1 | xargs kill -HUP pgrep nginx | head -1 | xargs kill -HUP
sleep 5 sleep 5
else else


+ 1
- 1
test/test_helper.bash View File

@ -72,7 +72,7 @@ if [[ -f /usr/bin/supervisord && -f /etc/supervisord.conf ]]; then
if [[ ! $(pgrep supervisord) ]]; then if [[ ! $(pgrep supervisord) ]]; then
/usr/bin/supervisord -c /etc/supervisord.conf >&3- /usr/bin/supervisord -c /etc/supervisord.conf >&3-
fi fi
elif [ "$GETSSL_OS" == "centos7" ]; then
elif [[ "$GETSSL_OS" == "centos"[78] ]]; then
if [ -z "$(pgrep nginx)" ]; then if [ -z "$(pgrep nginx)" ]; then
nginx >&3- nginx >&3-
fi fi


Loading…
Cancel
Save