diff options
| author | Wouter Deconinck <wdconinc@gmail.com> | 2024-05-01 06:37:13 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-01 13:37:13 +0200 |
| commit | 067155cff54a489b1dd930b89ec079f2be40a690 (patch) | |
| tree | 4abde0170c7582604eb99006d06655e0d094509b | |
| parent | 08e68d779f25c131b6c7d63f133ba1d19e50ab9c (diff) | |
| download | spack-067155cff54a489b1dd930b89ec079f2be40a690.tar.gz spack-067155cff54a489b1dd930b89ec079f2be40a690.tar.bz2 spack-067155cff54a489b1dd930b89ec079f2be40a690.tar.xz spack-067155cff54a489b1dd930b89ec079f2be40a690.zip | |
containers: add ubuntu 24.04 (#43881)
* containers: add ubuntu 24.04
* containers: use python3-boto3 pkg instead of pip install
| -rw-r--r-- | .github/workflows/build-containers.yml | 1 | ||||
| -rw-r--r-- | lib/spack/docs/containers.rst | 3 | ||||
| -rw-r--r-- | lib/spack/spack/container/images.json | 7 | ||||
| -rw-r--r-- | share/spack/templates/container/ubuntu_2404.dockerfile | 33 |
4 files changed, 44 insertions, 0 deletions
diff --git a/.github/workflows/build-containers.yml b/.github/workflows/build-containers.yml index 43517508a8..77f756e168 100644 --- a/.github/workflows/build-containers.yml +++ b/.github/workflows/build-containers.yml @@ -45,6 +45,7 @@ jobs: [leap15, 'linux/amd64,linux/arm64,linux/ppc64le', 'opensuse/leap:15'], [ubuntu-focal, 'linux/amd64,linux/arm64,linux/ppc64le', 'ubuntu:20.04'], [ubuntu-jammy, 'linux/amd64,linux/arm64,linux/ppc64le', 'ubuntu:22.04'], + [ubuntu-noble, 'linux/amd64,linux/arm64,linux/ppc64le', 'ubuntu:24.04'], [almalinux8, 'linux/amd64,linux/arm64,linux/ppc64le', 'almalinux:8'], [almalinux9, 'linux/amd64,linux/arm64,linux/ppc64le', 'almalinux:9'], [rockylinux8, 'linux/amd64,linux/arm64', 'rockylinux:8'], diff --git a/lib/spack/docs/containers.rst b/lib/spack/docs/containers.rst index 25ad22525e..e22095ca13 100644 --- a/lib/spack/docs/containers.rst +++ b/lib/spack/docs/containers.rst @@ -203,6 +203,9 @@ The OS that are currently supported are summarized in the table below: * - Ubuntu 22.04 - ``ubuntu:22.04`` - ``spack/ubuntu-jammy`` + * - Ubuntu 24.04 + - ``ubuntu:24.04`` + - ``spack/ubuntu-noble`` * - CentOS 7 - ``centos:7`` - ``spack/centos7`` diff --git a/lib/spack/spack/container/images.json b/lib/spack/spack/container/images.json index e91f369547..7cb76f8505 100644 --- a/lib/spack/spack/container/images.json +++ b/lib/spack/spack/container/images.json @@ -138,6 +138,13 @@ }, "os_package_manager": "apt" }, + "ubuntu:24.04": { + "bootstrap": { + "template": "container/ubuntu_2404.dockerfile" + }, + "os_package_manager": "apt", + "build": "spack/ubuntu-noble" + }, "ubuntu:22.04": { "bootstrap": { "template": "container/ubuntu_2204.dockerfile" diff --git a/share/spack/templates/container/ubuntu_2404.dockerfile b/share/spack/templates/container/ubuntu_2404.dockerfile new file mode 100644 index 0000000000..1cf4cfb101 --- /dev/null +++ b/share/spack/templates/container/ubuntu_2404.dockerfile @@ -0,0 +1,33 @@ +{% extends "container/bootstrap-base.dockerfile" %} +{% block env_vars %} +{{ super() }} +ENV DEBIAN_FRONTEND=noninteractive \ + LANGUAGE=en_US.UTF-8 \ + LANG=en_US.UTF-8 \ + LC_ALL=en_US.UTF-8 +{% endblock %} +{% block install_os_packages %} +RUN apt-get -yqq update \ + && apt-get -yqq upgrade \ + && apt-get -yqq install --no-install-recommends \ + build-essential \ + ca-certificates \ + curl \ + file \ + g++ \ + gcc \ + gfortran \ + git \ + gnupg2 \ + iproute2 \ + locales \ + make \ + mercurial \ + subversion \ + python3 \ + python3-boto3 \ + unzip \ + zstd \ + && locale-gen en_US.UTF-8 \ + && rm -rf /var/lib/apt/lists/* +{% endblock %} |