Porównaj commity

...

10 Commity

Autor SHA1 Wiadomość Data
Erik Sundell f667caf49c
Merge pull request #1332 from yuvipanda/bump-alpine
Dockerfile: bump alpine from 3.17 to 3.19 and Python 3.10 to 3.11
2024-03-24 23:08:31 +01:00
Erik Sundell 755a32bc2a
Merge pull request #1337 from SylvainCorlay/mamba-1.5.7
Update mamba to 1.5.7 from 1.5.1, and conda to 24.3.0 from 23.7.4
2024-03-24 22:50:58 +01:00
Erik Sundell 91d3f150e5
Use ARG instead of ENV for build time only environment variable 2024-03-24 22:35:15 +01:00
Erik Sundell f121a0d481
Use modern ENV syntax in Dockerfile
The use of `ENV key value` is an old alternative syntax still around for backward compatibility, but may be removed according to https://docs.docker.com/reference/dockerfile/#env.
2024-03-24 22:22:47 +01:00
Erik Sundell 57e4b3f687
Fix unrelated comment 2024-03-24 22:18:23 +01:00
Erik Sundell 920ddd86ac
Update conda from 23.7.4 to 24.3.0 2024-03-24 22:16:05 +01:00
YuviPanda 601fa25291 Don't use --user to install anything 2024-03-22 19:40:41 -07:00
YuviPanda 756e7d1a98 Put everything inside a venv 2024-03-22 19:40:41 -07:00
YuviPanda dd9f6ad2de Bump alpine version used in Dockerfile
Brings us to latest alpine, and to a newer python
2024-03-22 19:40:41 -07:00
Sylvain Corlay 01d818b974 Update to mamba 1.5.7 2024-03-22 21:34:50 +01:00
3 zmienionych plików z 22 dodań i 12 usunięć

Wyświetl plik

@ -1,16 +1,21 @@
# syntax = docker/dockerfile:1.3
ARG ALPINE_VERSION=3.17
ARG ALPINE_VERSION=3.19
FROM alpine:${ALPINE_VERSION}
RUN apk add --no-cache git python3 python3-dev py3-pip py3-setuptools build-base
# build wheels in first image
# build wheels in a build stage
ARG VIRTUAL_ENV=/opt/venv
ENV PATH=${VIRTUAL_ENV}/bin:${PATH}
RUN python3 -m venv ${VIRTUAL_ENV}
ADD . /tmp/src
RUN cd /tmp/src && git clean -xfd && git status
RUN mkdir /tmp/wheelhouse \
&& cd /tmp/wheelhouse \
&& pip3 install wheel \
&& pip3 wheel --no-cache-dir /tmp/src \
&& pip install wheel \
&& pip wheel --no-cache-dir /tmp/src \
&& ls -l /tmp/wheelhouse
FROM alpine:${ALPINE_VERSION}
@ -18,13 +23,18 @@ FROM alpine:${ALPINE_VERSION}
# install python, git, bash, mercurial
RUN apk add --no-cache git git-lfs python3 py3-pip py3-setuptools bash docker mercurial
ARG VIRTUAL_ENV=/opt/venv
ENV PATH=${VIRTUAL_ENV}/bin:${PATH}
RUN python3 -m venv ${VIRTUAL_ENV}
# install hg-evolve (Mercurial extensions)
RUN pip3 install hg-evolve --user --no-cache-dir
RUN pip install hg-evolve --no-cache-dir
# install repo2docker
COPY --from=0 /tmp/wheelhouse /tmp/wheelhouse
RUN pip3 install --no-cache-dir --ignore-installed --no-deps /tmp/wheelhouse/*.whl \
&& pip3 list
RUN pip install --no-cache-dir --ignore-installed --no-deps /tmp/wheelhouse/*.whl \
&& pip list
# add git-credential helper
COPY ./docker/git-credential-env /usr/local/bin/git-credential-env

Wyświetl plik

@ -5,8 +5,8 @@ set -ex
cd $(dirname $0)
export MAMBA_VERSION=1.5.1
export CONDA_VERSION=23.7.4
export MAMBA_VERSION=1.5.7
export CONDA_VERSION=24.3.0
URL="https://anaconda.org/conda-forge/micromamba/${MAMBA_VERSION}/download/${CONDA_PLATFORM}/micromamba-${MAMBA_VERSION}-0.tar.bz2"

Wyświetl plik

@ -16,13 +16,13 @@ v = out.split()[1]
assert v[:3] == "3.5", out
out = sh(["micromamba", "--version"])
assert out == "1.5.1", out
assert out == "1.5.7", out
out = sh(["mamba", "--version"])
assert (
out
== """mamba 1.5.1
conda 23.7.4"""
== """mamba 1.5.7
conda 24.3.0"""
), out
sh([kernel_python, "-c", "import numpy"])