From 0f822430a67a76d3b1b44908316ff564f29b3c25 Mon Sep 17 00:00:00 2001 From: RafalSkolasinski Date: Wed, 14 Sep 2022 10:48:49 +0100 Subject: [PATCH] update conda in base image and use ubi9 (#4329) * update conda and install final version earlier * use ubi8 to ubi9 base image --- wrappers/s2i/python/Dockerfile.conda | 8 +++++--- wrappers/s2i/python/Makefile | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/wrappers/s2i/python/Dockerfile.conda b/wrappers/s2i/python/Dockerfile.conda index 32460bf38c..96e65fb0ab 100644 --- a/wrappers/s2i/python/Dockerfile.conda +++ b/wrappers/s2i/python/Dockerfile.conda @@ -1,4 +1,4 @@ -FROM registry.access.redhat.com/ubi8/ubi +FROM registry.access.redhat.com/ubi9/ubi # $ docker build . -t continuumio/miniconda3:latest -t continuumio/miniconda3:4.5.11 # $ docker run --rm -it continuumio/miniconda3:latest /bin/bash @@ -9,16 +9,18 @@ ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 ENV PATH /opt/conda/bin:$PATH RUN dnf update -y && \ - dnf install -y wget bzip2 ca-certificates curl git + dnf install -y wget bzip2 ca-certificates curl-minimal git # MPL based licenses RUN wget -O certifi-python-certifi.tar.gz https://github.com/certifi/python-certifi/archive/master.tar.gz ARG CONDA_DOWNLOAD_VERSION +ARG CONDA_VERSION RUN wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-${CONDA_DOWNLOAD_VERSION}-Linux-x86_64.sh -O ~/miniconda.sh && \ /bin/bash ~/miniconda.sh -b -p /opt/conda && \ rm ~/miniconda.sh && \ - /opt/conda/bin/conda clean -tipsy && \ + /opt/conda/bin/conda install --yes conda=${CONDA_VERSION} && \ + /opt/conda/bin/conda clean -tipy && \ ln -s /opt/conda/etc/profile.d/conda.sh /etc/profile.d/conda.sh && \ echo ". /opt/conda/etc/profile.d/conda.sh" >> ~/.bashrc && \ echo "conda activate base" >> ~/.bashrc && \ diff --git a/wrappers/s2i/python/Makefile b/wrappers/s2i/python/Makefile index a749b4da73..05c1e0c540 100644 --- a/wrappers/s2i/python/Makefile +++ b/wrappers/s2i/python/Makefile @@ -4,7 +4,7 @@ SHELL:=/bin/bash PYTHON_VERSION=3.8.10 CONDA_DOWNLOAD_VERSION=py38_4.12.0 -CONDA_VERSION=4.13.0 +CONDA_VERSION=4.14.0 IMAGE_PYTHON_VERSION=`echo -n $(PYTHON_VERSION) | cut -d. -f1-2 | sed 's/\.//g'` DEFAULT_IMAGE_PYTHON_VERSION=`echo -n $(PYTHON_VERSION) | cut -d. -f1`