diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f087ead..708b6f0 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -6,10 +6,10 @@ on: jobs: tests_full: - name: functional tests on all supported distros + name: Full strategy: matrix: - platform: [centos7, centos8, debian10, debian8, debian9, opensuse15, opensuse151, ubuntu1404, ubuntu1604, ubuntu1804, ubuntu2004] + platform: [centos7, centos8, debian10, debian8, debian9, opensuse150, opensuse151, opensuse152, ubuntu1404, ubuntu1604, ubuntu1804, ubuntu2004] runs-on: ubuntu-latest if: contains(github.event.pull_request.labels.*.name, 'tests:full') steps: @@ -20,7 +20,7 @@ jobs: DOCKER_TTY: false tests_short: - name: functional tests on Debian 10 + name: Full on Debian 10 runs-on: ubuntu-latest if: contains(github.event.pull_request.labels.*.name, 'tests:short') steps: diff --git a/README.md b/README.md index 4b244f3..c8dae6e 100644 --- a/README.md +++ b/README.md @@ -71,7 +71,7 @@ Linux distros below are tested with each release, but as this is a security prod - Debian 10 (Buster), 9 (Stretch), 8 (Jessie) - RHEL/CentOS 8, 7 - Ubuntu LTS 20.04, 18.04, 16.04, 14.04* -- OpenSUSE Leap 15.1*, 15* +- OpenSUSE Leap 15.2*, 15.1*, 15.0* *: Note that these versions have no MFA support. Any other so-called "modern" Linux version are not tested with each release, but should work with no or minor adjustments. diff --git a/doc/sphinx/installation/basic.rst b/doc/sphinx/installation/basic.rst index 7f85913..1268be5 100644 --- a/doc/sphinx/installation/basic.rst +++ b/doc/sphinx/installation/basic.rst @@ -16,7 +16,7 @@ The following Linux distros are tested with each release, but as this is a secur - Debian 10 (Buster), 9 (Stretch), 8 (Jessie) - RHEL/CentOS 8, 7 - Ubuntu LTS 20.04, 18.04, 16.04, 14.04* -- OpenSUSE Leap 15.1*, 15* +- OpenSUSE Leap 15.2*, 15.1*, 15.0* \*: Note that these versions have no MFA support. diff --git a/docker/Dockerfile.opensuse15 b/docker/Dockerfile.opensuse150 similarity index 100% rename from docker/Dockerfile.opensuse15 rename to docker/Dockerfile.opensuse150 diff --git a/docker/Dockerfile.opensuse152 b/docker/Dockerfile.opensuse152 new file mode 100644 index 0000000..79ba347 --- /dev/null +++ b/docker/Dockerfile.opensuse152 @@ -0,0 +1,26 @@ +FROM opensuse/leap:15.2 +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/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"] + +# disable /dev/kmsg handling by syslog-ng and explicitely 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","--no-wait"] + +# start at entrypoint +ENTRYPOINT /opt/bastion/docker/entrypoint.sh + +# TESTENV HAS_ED25519=1 HAS_BLACKLIST=0 HAS_MFA=0 HAS_PAMTESTER=0