Skip to content
Draft
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 4 additions & 9 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,9 @@ jobs:
--file=./python/base/Dockerfile.base \
--tag=978928340082.dkr.ecr.us-east-1.amazonaws.com/${REPOSITORY}:${TAG}${TAG_SUFFIX} \
--tag=docker.io/${REPOSITORY}:${TAG}${TAG_SUFFIX} \
--cache-from type=registry,ref=docker.io/${REPOSITORY}:${TAG}-buildcache \
--cache-from type=registry,ref=docker.io/${REPOSITORY}:${TAG}${TAG_SUFFIX}-buildcache \
--cache-to type=registry,ref=docker.io/${REPOSITORY}:${TAG}${TAG_SUFFIX}-buildcache,mode=max,image-manifest=true,oci-mediatypes=true \
--progress plain \
--platform linux/amd64 \
--platform linux/arm64 \
--provenance=false \
--sbom=false \
--output type=registry,push=true \
Expand All @@ -69,6 +67,7 @@ jobs:
- setup_buildkit_builder
- run:
name: Build and push python image
no_output_timeout: 60m # building Python can take a while, default timeout is 10m
command: |
REPOSITORY="deepnote/python"
TAG="${PYTHON_VERSION}"
Expand All @@ -79,11 +78,9 @@ jobs:
--tag=978928340082.dkr.ecr.us-east-1.amazonaws.com/${REPOSITORY}:${TAG}${TAG_SUFFIX} \
--tag=docker.io/${REPOSITORY}:${TAG}${TAG_SUFFIX} \
--build-arg CIRCLE_PULL_REQUEST=${CIRCLE_PULL_REQUEST} \
--cache-from type=registry,ref=docker.io/${REPOSITORY}:${TAG}-buildcache \
--cache-from type=registry,ref=docker.io/${REPOSITORY}:${TAG}${TAG_SUFFIX}-buildcache \
--cache-to type=registry,ref=docker.io/${REPOSITORY}:${TAG}${TAG_SUFFIX}-buildcache,mode=max,image-manifest=true,oci-mediatypes=true \
--progress plain \
--platform linux/amd64 \
--platform linux/arm64 \
--provenance=false \
--sbom=false \
--output type=registry,push=true \
Expand Down Expand Up @@ -113,11 +110,9 @@ jobs:
--tag=docker.io/${REPOSITORY}:${TAG}${TAG_SUFFIX} \
--build-arg CIRCLE_PULL_REQUEST=${CIRCLE_PULL_REQUEST} \
--build-arg PYTHON_VERSION=${PYTHON_VERSION} \
--cache-from type=registry,ref=docker.io/${REPOSITORY}:${TAG}-buildcache \
--cache-from type=registry,ref=docker.io/${REPOSITORY}:${TAG}${TAG_SUFFIX}-buildcache \
--cache-to type=registry,ref=docker.io/${REPOSITORY}:${TAG}${TAG_SUFFIX}-buildcache,mode=max,image-manifest=true,oci-mediatypes=true \
--progress plain \
--platform linux/amd64 \
--platform linux/arm64 \
--provenance=false \
--sbom=false \
--output type=registry,push=true \
Expand Down
4 changes: 4 additions & 0 deletions python/conda/Dockerfile.conda
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ ARG PYTHON_VERSION
RUN wget --quiet "https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh" -O /tmp/miniconda.sh && \
/bin/bash /tmp/miniconda.sh -b -p /opt/conda && \
rm /tmp/miniconda.sh && \
# Use community packages from conda-forge instead of Anaconda Inc. default channels
# which require accepting terms of service & using commercial license for orgs with more than 200 employees
/opt/conda/bin/conda config --add channels conda-forge && \
/opt/conda/bin/conda config --remove channels defaults && \
# Install the correct version of python (as the time of writing, anaconda
# installed python 3.11 by default) for parity with our base image
/opt/conda/bin/conda install python=${PYTHON_VERSION} && \
Expand Down