Build Ubuntu 24.04 image in CI (#54)

spack · Aug 9, 2024 · 903932a · 903932a
1 parent 8ecde34
commit 903932a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/.github/workflows/containers.yml b/.github/workflows/containers.yml
@@ -36,6 +36,7 @@ jobs:
         dockerfile: [[e4s-ubuntu-18.04, e4s-ubuntu-18.04.dockerfile, 'linux/amd64,linux/ppc64le,linux/arm64'],
                      [e4s-ubuntu-20.04, e4s-ubuntu-20.04.dockerfile, 'linux/amd64,linux/ppc64le,linux/arm64'],
                      [ubuntu-22.04, ubuntu-22.04.dockerfile, 'linux/amd64,linux/ppc64le,linux/arm64'],
+                     [ubuntu-24.04, ubuntu-24.04.dockerfile, 'linux/amd64,linux/ppc64le,linux/arm64'],
                      [linux-ubuntu22.04-x86_64_v2, linux-ubuntu22.04-x86_64_v2/Dockerfile, 'linux/amd64'],
                      [tutorial-ubuntu-22.04, tutorial-ubuntu-22.04/Dockerfile, 'linux/amd64'],
                      [e4s-amazonlinux-2, e4s-amazonlinux-2.dockerfile, 'linux/amd64,linux/arm64'],

diff --git a/Dockerfiles/ubuntu-24.04.dockerfile b/Dockerfiles/ubuntu-24.04.dockerfile
@@ -33,7 +33,8 @@ RUN apt update -y \
   patch \
   patchelf \
   pciutils \
-  python3-pip \
+  python3-full \
+  python3-dev \
   rsync \
   unzip \
   wget \
@@ -44,8 +45,11 @@ RUN apt update -y \
   && ln -s /usr/bin/gpg /usr/bin/gpg2 \
   && ln -s `which python3` /usr/bin/python
 
-RUN python -m pip install --upgrade pip setuptools wheel \
- && python -m pip install gnureadline boto3 pyyaml pytz minio requests clingo \
+ENV VIRTUAL_ENV=/opt/venv
+RUN python3 -m venv $VIRTUAL_ENV
+ENV PATH="$VIRTUAL_ENV/bin:$PATH"
+RUN python3 -m pip install --upgrade pip setuptools wheel \
+ && python3 -m pip install gnureadline boto3 pyyaml pytz minio requests clingo \
  && rm -rf ~/.cache
 
 CMD ["/bin/bash"]