Porównaj commity

..

No commits in common. "f667caf49c9f199304b210b6643771b4c7a08053" and "a20dd1cf9787ad961bb6773dbd8aaed6ef0ea414" have entirely different histories.

3 zmienionych plików z 12 dodań i 22 usunięć

Wyświetl plik

@ -1,21 +1,16 @@
# syntax = docker/dockerfile:1.3
ARG ALPINE_VERSION=3.19
ARG ALPINE_VERSION=3.17
FROM alpine:${ALPINE_VERSION}
RUN apk add --no-cache git python3 python3-dev py3-pip py3-setuptools build-base
# build wheels in a build stage
ARG VIRTUAL_ENV=/opt/venv
ENV PATH=${VIRTUAL_ENV}/bin:${PATH}
RUN python3 -m venv ${VIRTUAL_ENV}
# build wheels in first image
ADD . /tmp/src
RUN cd /tmp/src && git clean -xfd && git status
RUN mkdir /tmp/wheelhouse \
&& cd /tmp/wheelhouse \
&& pip install wheel \
&& pip wheel --no-cache-dir /tmp/src \
&& pip3 install wheel \
&& pip3 wheel --no-cache-dir /tmp/src \
&& ls -l /tmp/wheelhouse
FROM alpine:${ALPINE_VERSION}
@ -23,18 +18,13 @@ 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 pip install hg-evolve --no-cache-dir
RUN pip3 install hg-evolve --user --no-cache-dir
# install repo2docker
COPY --from=0 /tmp/wheelhouse /tmp/wheelhouse
RUN pip install --no-cache-dir --ignore-installed --no-deps /tmp/wheelhouse/*.whl \
&& pip list
RUN pip3 install --no-cache-dir --ignore-installed --no-deps /tmp/wheelhouse/*.whl \
&& pip3 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.7
export CONDA_VERSION=24.3.0
export MAMBA_VERSION=1.5.1
export CONDA_VERSION=23.7.4
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.7", out
assert out == "1.5.1", out
out = sh(["mamba", "--version"])
assert (
out
== """mamba 1.5.7
conda 24.3.0"""
== """mamba 1.5.1
conda 23.7.4"""
), out
sh([kernel_python, "-c", "import numpy"])