From 982f21a9500fb7d08a8eec1242e95020d91f2ebf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Lesimple?= Date: Wed, 9 Feb 2022 14:01:22 +0000 Subject: [PATCH] chore: remove CentOS 8 from tests (EOL) --- .github/workflows/tests.yml | 2 +- README.md | 2 +- doc/sphinx/installation/basic.rst | 2 +- docker/Dockerfile.centos8 | 27 --------------------------- 4 files changed, 3 insertions(+), 30 deletions(-) delete mode 100644 docker/Dockerfile.centos8 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 96acfc3..5bba0a2 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -34,7 +34,7 @@ jobs: name: Full strategy: matrix: - platform: [centos7, centos8, rockylinux8, debian9, debian10, debian11, 'opensuse15@opensuse/leap:15.3', ubuntu1604, ubuntu1804, ubuntu2004] + platform: [centos7, rockylinux8, debian9, debian10, debian11, 'opensuse15@opensuse/leap:15.3', ubuntu1604, ubuntu1804, ubuntu2004] runs-on: ubuntu-latest if: contains(github.event.pull_request.labels.*.name, 'tests:full') steps: diff --git a/README.md b/README.md index 5fda360..cee82f6 100644 --- a/README.md +++ b/README.md @@ -73,7 +73,7 @@ Also don't forget to customize your `bastion.conf` file, which can be found in ` Linux distros below are tested with each release, but as this is a security product, you are **warmly** advised to run it on the latest up-to-date stable version of your favorite OS: - Debian 11 (Bullseye), Debian 10 (Buster), 9 (Stretch) -- RHEL/CentOS 8.x, 7.x +- CentOS 7.x - RockyLinux 8.x - Ubuntu LTS 20.04, 18.04, 16.04 - OpenSUSE Leap 15.3\* diff --git a/doc/sphinx/installation/basic.rst b/doc/sphinx/installation/basic.rst index e5d5c24..137528a 100644 --- a/doc/sphinx/installation/basic.rst +++ b/doc/sphinx/installation/basic.rst @@ -33,7 +33,7 @@ The following Linux distros are tested with each release, but as this is a secur you are *warmly* advised to run it on the latest up-to-date stable version of your favorite OS: - Debian 11 (Bullseye), Debian 10 (Buster), 9 (Stretch) -- RHEL/CentOS 8.x, 7.x +- CentOS 7.x - RockyLinux 8.x - Ubuntu LTS 20.04, 18.04, 16.04 - OpenSUSE Leap 15.3\* diff --git a/docker/Dockerfile.centos8 b/docker/Dockerfile.centos8 deleted file mode 100644 index f2a609e..0000000 --- a/docker/Dockerfile.centos8 +++ /dev/null @@ -1,27 +0,0 @@ -FROM centos:8 -LABEL maintainer="stephane.lesimple+bastion@ovhcloud.com" - -# cache builds efficiently: just copy the scripts to install packages first -COPY bin/admin/install-ttyrec.sh bin/admin/install-yubico-piv-checker.sh bin/admin/packages-check.sh /opt/bastion/bin/admin/ -COPY lib/shell /opt/bastion/lib/shell/ -RUN ["/opt/bastion/bin/admin/packages-check.sh","-i","-d","-s"] -RUN ["/opt/bastion/bin/admin/install-ttyrec.sh","-r"] -RUN ["/opt/bastion/bin/admin/install-yubico-piv-checker.sh","-r"] - -# disable /dev/kmsg handling by syslog-ng and explicitly enable /dev/log -RUN test -e /etc/syslog-ng/syslog-ng.conf && \ - sed -i -re 's=system\(\);=unix-stream("/dev/log");=' /etc/syslog-ng/syslog-ng.conf - -# at each modification of our code, we'll start from here thanks to build cache -COPY . /opt/bastion - -# tests that the environment works -RUN ["/opt/bastion/bin/dev/perl-check.sh"] - -# setup ssh/sshd config and setup bastion install -RUN ["/opt/bastion/bin/admin/install","--new-install"] - -# start at entrypoint -ENTRYPOINT /opt/bastion/docker/entrypoint.sh - -# TESTOPT --has-mfa=1 --has-pamtester=1 --has-piv=1