From 357e4de1583b8baea34803d31d06361d76f2f6d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Lesimple?= Date: Mon, 1 Jul 2024 11:43:02 +0000 Subject: [PATCH] chg: add Ubuntu 24.04 LTS --- .github/workflows/tests.yml | 4 ++-- README.md | 2 +- doc/sphinx/installation/basic.rst | 2 +- docker/{Dockerfile.ubuntu1604 => Dockerfile.ubuntu2404} | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) rename docker/{Dockerfile.ubuntu1604 => Dockerfile.ubuntu2404} (93%) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c879d7a..c0a0514 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -22,7 +22,7 @@ jobs: name: Long strategy: matrix: - platform: [rockylinux9, debian12, 'opensuse15@opensuse/leap:15.5', ubuntu2204] + platform: [rockylinux9, debian12, 'opensuse15@opensuse/leap:15.5', ubuntu2404] runs-on: ubuntu-latest if: contains(github.event.pull_request.labels.*.name, 'tests:long') steps: @@ -38,7 +38,7 @@ jobs: name: Full strategy: matrix: - platform: [rockylinux8, rockylinux9, debian10, debian11, debian12, 'opensuse15@opensuse/leap:15.5', ubuntu1604, ubuntu1804, ubuntu2004, ubuntu2204] + platform: [rockylinux8, rockylinux9, debian10, debian11, debian12, 'opensuse15@opensuse/leap:15.5', ubuntu1804, ubuntu2004, ubuntu2204, ubuntu2404] runs-on: ubuntu-latest if: contains(github.event.pull_request.labels.*.name, 'tests:full') steps: diff --git a/README.md b/README.md index 7153c09..f94726d 100644 --- a/README.md +++ b/README.md @@ -74,7 +74,7 @@ Linux distros below are tested with each release, but as this is a security prod - Debian 12 (Bookworm), 11 (Bullseye), 10 (Buster) - RockyLinux 8.x, 9.x -- Ubuntu LTS 22.04, 20.04, 18.04, 16.04 +- Ubuntu LTS 22.04, 20.04, 18.04 - OpenSUSE Leap 15.5\* \*: Note that these versions have no out-of-the-box MFA support, as they lack packaged versions of `pamtester`, `pam-google-authenticator`, or both. Of course, you may compile those yourself. diff --git a/doc/sphinx/installation/basic.rst b/doc/sphinx/installation/basic.rst index d24c633..82fe18c 100644 --- a/doc/sphinx/installation/basic.rst +++ b/doc/sphinx/installation/basic.rst @@ -34,7 +34,7 @@ you are *warmly* advised to run it on the latest up-to-date stable version of yo - Debian 12 (Bookworm), 11 (Bullseye), 10 (Buster) - RockyLinux 8.x, 9.x -- Ubuntu LTS 22.04, 20.04, 18.04, 16.04 +- Ubuntu LTS 24.04, 22.04, 20.04, 18.04 - OpenSUSE Leap 15.5\* \*: Note that these versions have no out-of-the-box MFA support, as they lack packaged versions of ``pamtester``, diff --git a/docker/Dockerfile.ubuntu1604 b/docker/Dockerfile.ubuntu2404 similarity index 93% rename from docker/Dockerfile.ubuntu1604 rename to docker/Dockerfile.ubuntu2404 index 6d49677..9777282 100644 --- a/docker/Dockerfile.ubuntu1604 +++ b/docker/Dockerfile.ubuntu2404 @@ -1,4 +1,4 @@ -FROM ubuntu:16.04 +FROM ubuntu:24.04 LABEL maintainer="stephane.lesimple+bastion@ovhcloud.com" # cache builds efficiently: just copy the scripts to install packages first @@ -32,4 +32,4 @@ 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 +# TESTOPT --has-mfa=1 --has-pamtester=1 --has-piv=1 --has-sk=1