Skip to content

Commit 2adde9d

Browse files
committed
Update docker
1 parent 43b39ba commit 2adde9d

File tree

2 files changed

+9
-12
lines changed

2 files changed

+9
-12
lines changed

.gitlab-ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ image:build:
4040
needs: []
4141
tags:
4242
- container-registry-push
43-
rules:
44-
- if: '$CI_PIPELINE_SOURCE == "schedule"'
45-
- if: '$CI_BUILD_IMAGES == "1"'
43+
# rules:
44+
# - if: '$CI_PIPELINE_SOURCE == "schedule"'
45+
# - if: '$CI_BUILD_IMAGES == "1"'
4646
image:
4747
name: gcr.io/kaniko-project/executor:debug
4848
entrypoint: [ "" ]

docker/Dockerfile

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
FROM python:3.10
1+
FROM python:3.11
22
LABEL Pierre Augier <pierre.augier@univ-grenoble-alpes.fr>
3+
COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
34

45
RUN apt-get update
56

67
# also include utilities for debugging
78
RUN apt-get install -y --no-install-recommends \
89
clang \
910
emacs vim \
10-
meld less \
11-
# python3-pip is for Mercurial (hg-git, hg-evolve)
12-
mercurial python3-pip git
11+
meld less git
1312
RUN apt-get install -y --no-install-recommends \
1413
rsync \
1514
libgl1 xvfb xauth libgl1-mesa-dev \
@@ -26,10 +25,6 @@ RUN mkdir -p $HOME/opt
2625
WORKDIR $HOME/opt
2726
RUN echo $USER $HOME $PWD && whoami
2827

29-
ENV PIP_BREAK_SYSTEM_PACKAGES=1
30-
31-
RUN $(hg debuginstall -T '{pythonexe}') -m pip install hg-evolve hg-git --no-cache-dir --user
32-
3328
COPY --chown=appuser:appuser docker/hgrc $HOME/.hgrc
3429
COPY --chown=appuser:appuser docker/pythranrc $HOME/.pythranrc
3530

@@ -41,4 +36,6 @@ ENV PATH=$HOME/.local/bin:$PATH
4136
RUN mkdir -p $HOME/.config/matplotlib
4237
RUN echo 'backend : agg' > $HOME/.config/matplotlib/matplotlibrc
4338

44-
RUN python -m pip install -U pip pdm nox --user
39+
RUN uv tool install mercurial --with hg-evolve,hg-git
40+
RUN uv tool install pdm
41+
RUN uv tool install nox

0 commit comments

Comments
 (0)