Skip to content

Commit

Permalink
Merge branch 'topic/default/update-docker' into 'branch/default'
Browse files Browse the repository at this point in the history
Update Docker file

See merge request fluiddyn/fluidsim!360
  • Loading branch information
paugier committed Jan 15, 2024
2 parents cc2b4f9 + e38f7cb commit 3de301e
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 12 deletions.
22 changes: 12 additions & 10 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ variables:
COVERAGE_DIR: .coverage_$CI_COMMIT_SHA

image: registry.heptapod.net:443/fluiddyn/fluidsim/ci/default:stable
# for MR modifying the Docker file
# image: registry.heptapod.net:443/fluiddyn/fluidsim/ci/$CI_COMMIT_HG_BRANCH:stable

# ugly workaround https://gitlab.com/gitlab-org/gitlab/-/issues/370052#note_1207556577
workflow:
Expand All @@ -29,7 +31,7 @@ workflow:
# - python3.9 tmp_bug_unearth.py


CI image pixi:
image-pixi:build:
stage: image-pixi
tags:
- container-registry-push
Expand Down Expand Up @@ -60,11 +62,11 @@ CI image pixi:
--cleanup
--destination registry.heptapod.net:443/fluiddyn/fluidsim/ci/$CI_COMMIT_HG_BRANCH:pixi
test_pixi:
pixi-test:
stage: pixi
image: registry.heptapod.net:443/fluiddyn/fluidsim/ci/default:pixi
needs:
- job: "CI image pixi"
- job: "image-pixi:build"
optional: true
script:
- pixi info
Expand All @@ -79,7 +81,7 @@ test_pixi:

# Build an image for the other tasks; this should be a scheduled job, as
# it is quite unnecessary to run on every invocation.
CI image:
image:build:
stage: image
tags:
- container-registry-push
Expand Down Expand Up @@ -109,12 +111,12 @@ CI image:
--single-snapshot
--cleanup
--destination registry.heptapod.net:443/fluiddyn/fluidsim/ci/$CI_COMMIT_HG_BRANCH:stable
# --destination registry.heptapod.net:443/fluiddyn/fluidsim/ci/default:stable
validate_code:
stage: lint
needs:
- job: "CI image"
- job: "image:build"
optional: true
script:
- echo "CI_COMMIT_HG_BRANCH $CI_COMMIT_HG_BRANCH"
Expand All @@ -125,7 +127,7 @@ validate_code:
test_without_fft_and_pythran:
stage: test
needs:
- job: "CI image"
- job: "image:build"
optional: true
script:
- nox -s test_without_fft_and_pythran
Expand All @@ -139,7 +141,7 @@ test_without_fft_and_pythran:
test_with_fft_and_pythran:
stage: test
needs:
- job: "CI image"
- job: "image:build"
optional: true
script:
- nox -s test_with_fft_and_pythran
Expand All @@ -165,7 +167,7 @@ report_coverage:
test-release:examples:
stage: test-release
needs:
- job: "CI image"
- job: "image:build"
optional: true
rules:
- if: '$CI_PIPELINE_SOURCE == "schedule"'
Expand All @@ -186,7 +188,7 @@ test-release:examples:
pages:
stage: doc
needs:
- job: "CI image"
- job: "image:build"
optional: true
variables:
FLUIDFFT_TRANSONIC_BACKEND: "python"
Expand Down
6 changes: 4 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@ RUN mkdir -p $HOME/opt
WORKDIR $HOME/opt
RUN echo $USER $HOME $PWD && whoami

RUN $(hg debuginstall -T '{pythonexe}') -m pip install hg-evolve hg-git --no-cache-dir --user --break-system-packages
ENV PIP_BREAK_SYSTEM_PACKAGES=1

RUN $(hg debuginstall -T '{pythonexe}') -m pip install hg-evolve hg-git --no-cache-dir --user

COPY --chown=appuser:appuser docker/hgrc $HOME/.hgrc
COPY --chown=appuser:appuser docker/pythranrc $HOME/.pythranrc
Expand Down Expand Up @@ -59,4 +61,4 @@ RUN wget https://foss.heptapod.net/fluiddyn/fluidfft/raw/branch/default/doc/inst
RUN chmod +x install_pfft.sh
RUN ./install_pfft.sh

RUN pip install -U pip pdm nox --user
RUN python -m pip install -U pip pdm nox --user
1 change: 1 addition & 0 deletions noxfile.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import os

import nox

os.environ.update({"PDM_IGNORE_SAVED_PYTHON": "1"})
Expand Down

0 comments on commit 3de301e

Please sign in to comment.