Skip to content

Commit

Permalink
update conda in base image and use ubi9 (#4329)
Browse files Browse the repository at this point in the history
* update conda and install final version earlier

* use ubi8 to ubi9 base image
  • Loading branch information
RafalSkolasinski authored Sep 14, 2022
1 parent 750b079 commit 0f82243
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
8 changes: 5 additions & 3 deletions wrappers/s2i/python/Dockerfile.conda
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 && \
Expand Down
2 changes: 1 addition & 1 deletion wrappers/s2i/python/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down

0 comments on commit 0f82243

Please sign in to comment.