From 0e9b2678ae8d87106851febe1b96b964ab4abe2f Mon Sep 17 00:00:00 2001 From: Henri Menke Date: Wed, 6 Dec 2023 09:30:34 +0100 Subject: [PATCH] Make python3 default by installing python-is-python3 --- Docker/github_ci_dockerfile | 4 +--- Docker/mpich_dockerfile | 1 + Docker/openmpi_dockerfile | 4 +--- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Docker/github_ci_dockerfile b/Docker/github_ci_dockerfile index 12eaec9e..667bdbfe 100644 --- a/Docker/github_ci_dockerfile +++ b/Docker/github_ci_dockerfile @@ -18,6 +18,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ openmpi-bin \ openmpi-common \ openmpi-doc \ + python-is-python3 \ python3-dev \ python3-mako \ python3-numpy \ @@ -44,9 +45,6 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ apt-get autoclean -y && \ rm -rf /var/cache/apt/* /var/lib/apt/lists/* -# make python3 default -RUN `ln -s /usr/bin/python3 /usr/bin/python` - RUN pip3 install --no-cache-dir \ cython \ decorator \ diff --git a/Docker/mpich_dockerfile b/Docker/mpich_dockerfile index 63f5c818..93995031 100644 --- a/Docker/mpich_dockerfile +++ b/Docker/mpich_dockerfile @@ -36,6 +36,7 @@ RUN apt-get update && \ libc++-${LLVM}-dev \ libc++abi-${LLVM}-dev \ libboost-dev \ + python-is-python3 \ python3-pip \ python3-setuptools \ python3-dev \ diff --git a/Docker/openmpi_dockerfile b/Docker/openmpi_dockerfile index cc968494..42b48d11 100644 --- a/Docker/openmpi_dockerfile +++ b/Docker/openmpi_dockerfile @@ -38,6 +38,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins libfabric-dev \ libomp-${LLVM}-dev \ nodejs \ + python-is-python3 \ python3-dev \ python3-mako \ python3-numpy \ @@ -55,9 +56,6 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins apt-get autoclean -y && \ rm -rf /var/cache/apt/* /var/lib/apt/lists/* -# make python3 default -RUN `ln -s /usr/bin/python3 /usr/bin/python` - # install openmpi and compile openmpi manually # this is to ensure PMI compatibility with cray systems # RUN wget -q https://download.open-mpi.org/release/open-mpi/v4.1/openmpi-4.1.5.tar.gz \