diff options
| author | SPRENGER Julia, NEA/SCI/DB <julia.sprenger@oecd-nea.org> | 2025-09-12 15:30:01 +0000 |
|---|---|---|
| committer | SPRENGER Julia, NEA/SCI/DB <julia.sprenger@oecd-nea.org> | 2025-09-12 15:30:01 +0000 |
| commit | eee582f8594d3b7d01b65660ca1e8bef00eb6b2a (patch) | |
| tree | 0d3e8f721c84b3c3b2d03e9898a8a0a9c29287d8 | |
| parent | b9c84420360158f59beb8248e1f87f155df5a1ee (diff) | |
| parent | 85fc5e365230c28ece6ecd8403a3f426a68db2f8 (diff) | |
Merge branch 'improve_docker_build' into 'main'
Improve docker build time
See merge request dragon/5.1!4
| -rw-r--r-- | .nea/.gitlab-ci.yml | 5 | ||||
| -rw-r--r-- | .nea/docker/Dockerfile.slim | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/.nea/.gitlab-ci.yml b/.nea/.gitlab-ci.yml index 45b1787..cb72907 100644 --- a/.nea/.gitlab-ci.yml +++ b/.nea/.gitlab-ci.yml @@ -210,5 +210,8 @@ docker_ubuntu24_slim: /kaniko/executor --context "${CI_PROJECT_DIR}" --dockerfile "${CI_PROJECT_DIR}/.nea/docker/Dockerfile.slim" - --destination "${DOCKER_BASE_REPO}/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}:v5.1.0-slim" + --destination "${DOCKER_BASE_REPO}/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}:${CI_COMMIT_TAG}-slim" --single-snapshot --cache=false + rules: + - if: '$CI_COMMIT_TAG =~ /v+\d+\.\d+\.\d+/' + diff --git a/.nea/docker/Dockerfile.slim b/.nea/docker/Dockerfile.slim index ebfae15..251dfb5 100644 --- a/.nea/docker/Dockerfile.slim +++ b/.nea/docker/Dockerfile.slim @@ -32,13 +32,14 @@ RUN AG="env DEBIAN_FRONTEND=noninteractive apt-get -yq" && \ rm -rf .git Donjon/data Dragon/data Trivac/data doc && \ cd ${DRAGON_CODE_DIR}/Donjon && \ make hdf5=1 openmp=1 && \ - # this doesn't remove the binaries, just the *.o and the *.a and *.mod files - make clean && \ cd ../PyGan && \ make hdf5=1 openmp=1 && \ # this doesn't remove the binaries, just the *.o and the *.a and *.mod files make clean && \ - cd ../Ganlib && \ + cd ${DRAGON_CODE_DIR}/Donjon && \ + # this doesn't remove the binaries, just the *.o and the *.a and *.mod files + make clean && \ + cd ${DRAGON_CODE_DIR}/Ganlib && \ ./rganlib -q testgan1.x2m && \ ./rganlib -q testgan2.x2m && \ ./rganlib -q testgan3.x2m && \ |