Browse Source

Test on rockylinux

pull/678/head
Tim Kimber 4 years ago
parent
commit
f38b8212a3
No known key found for this signature in database GPG Key ID: 3E1804964E76BD18
5 changed files with 49 additions and 3 deletions
  1. +8
    -0
      .github/workflows/run-tests-pebble.yml
  2. +38
    -0
      test/Dockerfile-rockylinux8
  3. +1
    -1
      test/restart-ftpd
  4. +1
    -1
      test/restart-nginx
  5. +1
    -1
      test/test_helper.bash

+ 8
- 0
.github/workflows/run-tests-pebble.yml View File

@ -73,6 +73,14 @@ jobs:
run: docker-compose up -d --build
- name: Run test suite on Debian
run: test/run-test.sh debian
test-rockylinux8:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: Build the docker-compose stack
run: docker-compose up -d --build
- name: Run test suite on RockyLinux8
run: test/run-test.sh rockylinux8
test-ubuntu:
runs-on: ubuntu-latest
steps:


+ 38
- 0
test/Dockerfile-rockylinux8 View File

@ -0,0 +1,38 @@
FROM rockylinux/rockylinux:8
# 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
RUN yum -y install ftp vsftpd
RUN yum -y install openssh-server
RUN yum -y install glibc-locale-source glibc-langpack-en # for en_US.UTF-8 support
# Set locale
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8
WORKDIR /root
RUN mkdir -p /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
# Setup ftp
ENV VSFTPD_CONF=/etc/vsftpd/vsftpd.conf
ENV FTP_PASSIVE_DEFAULT=true
COPY test/test-config/vsftpd.conf /etc/vsftpd/vsftpd.conf
RUN adduser ftpuser
RUN echo 'ftpuser:ftpuser' | chpasswd
RUN adduser www-data
RUN usermod -G www-data ftpuser
RUN usermod -G www-data root
RUN mkdir -p /var/www/.well-known/acme-challenge
RUN chown -R www-data.www-data /var/www
RUN chmod g+w -R /var/www
# BATS (Bash Automated Testings)
RUN git clone --depth 1 https://github.com/bats-core/bats-core.git /bats-core --branch v1.2.1
RUN git clone --depth 1 https://github.com/bats-core/bats-support /bats-support
RUN git clone --depth 1 https://github.com/bats-core/bats-assert /bats-assert
RUN /bats-core/install.sh /usr/local

+ 1
- 1
test/restart-ftpd View File

@ -2,7 +2,7 @@
if [ "$GETSSL_OS" = "alpine" ]; then
killall -HUP vsftpd >&3-
elif [[ "$GETSSL_OS" == "centos"[78] ]]; then
elif [[ "$GETSSL_OS" == "centos"[78] || "$GETSSL_OS" == "rockylinux"* ]]; then
pgrep vsftpd | head -1 | xargs kill -HUP
else
service vsftpd restart >/dev/null >&3-


+ 1
- 1
test/restart-nginx View File

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


+ 1
- 1
test/test_helper.bash View File

@ -80,7 +80,7 @@ if [[ -f /usr/bin/supervisord && -f /etc/supervisord.conf ]]; then
# Give supervisord time to start
sleep 1
fi
elif [[ "$GETSSL_OS" == "centos"[78] ]]; then
elif [[ "$GETSSL_OS" == "centos"[78] || "$GETSSL_OS" == "rockylinux"* ]]; then
if [ -z "$(pgrep nginx)" ]; then
nginx >&3-
fi


Loading…
Cancel
Save