Skip to content

Commit b0697fd

Browse files
committed
Base conda image on base
1 parent b48acb8 commit b0697fd

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ workflows:
241241
parameters:
242242
python-version: *python-versions
243243
requires:
244-
- Python << matrix.python-version >>
244+
- Building the base image
245245

246246
- build-and-push-gpu:
247247
name: Tensorflow 2.9

python/conda/Dockerfile.conda

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
ARG PYTHON_VERSION=3.8
22
ARG CIRCLE_PULL_REQUEST
3-
FROM deepnote/python:${PYTHON_VERSION}${CIRCLE_PULL_REQUEST:+-ra-${CIRCLE_PULL_REQUEST##*/}}
3+
FROM deepnote/base
44

55
RUN apt-get update && \
66
apt-get install -y --no-install-recommends \
77
tini \
8-
libffi-dev \
98
libglib2.0-0 libxext6 libsm6 libxrender1 && \
109
apt-get clean && \
1110
rm -rf /var/lib/apt/lists/*
@@ -21,10 +20,15 @@ ARG PYTHON_VERSION
2120
RUN MINICONDA_URL="https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh"; \
2221
wget --quiet $MINICONDA_URL -O /tmp/miniconda.sh && \
2322
/bin/bash /tmp/miniconda.sh -b -p /opt/conda && \
24-
rm /tmp/miniconda.sh
23+
rm /tmp/miniconda.sh && \
24+
# Install the correct version of python (as the time of
25+
# writing, anaconda installed python 3.9 by default)
26+
/opt/conda/bin/conda install python=${PYTHON_VERSION} && \
27+
/opt/conda/bin/conda clean --all
2528

2629
ENV PATH=/opt/conda/bin:$PATH
2730

31+
ENV PIP_TARGET=/opt/conda/lib/python${PYTHON_VERSION}/site-packages
2832

2933
# Remove the system wide .profile file, because it overwrites the $PATH variable
3034
# and therefore the /opt/conda/bin directory is not in the $PATH.

0 commit comments

Comments
 (0)