From 5246793506b75ae66e34c86723ea7803ee09eca3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franck=20P=C3=A9rignon?=
<franck.perignon@univ-grenoble-alpes.fr>
Date: Mon, 16 Sep 2024 11:36:26 +0200
Subject: [PATCH] =?UTF-8?q?[docker-build-cpu-intel-user]=20[docker-build-g?=
=?UTF-8?q?pu-nvidia-user]=C2=A0Try=20to=20fix=20docker=20images=20gen=20w?=
=?UTF-8?q?ith=20CI=20(symlink=20loop=3F)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitlab-ci.yml | 4 ++--
ci/docker_images/ci_user/Dockerfile | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b7d4e6c55..5f0f96a3c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -67,7 +67,7 @@ ubuntu:cpu-intel-user:docker-build:
rules:
- if: $CI_COMMIT_MESSAGE =~ /\[docker-build\]/
- if: $CI_COMMIT_TAG
- - if: $CI_COMMIT_MESSAGE =~ /\[cpu-intel-user:docker-build:\]/
+ - if: $CI_COMMIT_MESSAGE =~ /\[docker-build-cpu-intel-user\]/
ubuntu:gpu-nvidia-user:docker-build:
variables:
@@ -81,7 +81,7 @@ ubuntu:gpu-nvidia-user:docker-build:
rules:
- if: $CI_COMMIT_MESSAGE =~ /\[docker-build\]/
- if: $CI_COMMIT_TAG
- - if: $CI_COMMIT_MESSAGE =~ /\[gpu-nvidia-user:docker-build\]/
+ - if: $CI_COMMIT_MESSAGE =~ /\[docker-build-gpu-nvidia-user\]/
##############################
## CPU Intel ##
diff --git a/ci/docker_images/ci_user/Dockerfile b/ci/docker_images/ci_user/Dockerfile
index a75a02ba0..79647cfad 100644
--- a/ci/docker_images/ci_user/Dockerfile
+++ b/ci/docker_images/ci_user/Dockerfile
@@ -199,10 +199,10 @@ RUN rm -rf pyFFTW
FROM hysop-full-python AS hysop-final
# Copy only necessary files from previous stages
-COPY --from=hptt /opt/conda/lib/*hptt* /opt/conda/lib
+COPY --from=hptt /opt/conda/lib/libhptt* /opt/conda/lib
COPY --from=hptt /opt/conda/include /opt/conda/include
COPY --from=flint /opt/conda/include/flint /opt/conda/include/flint
-COPY --from=flint /opt/conda/lib/*flint* /opt/conda/lib
+COPY --from=flint /opt/conda/lib/libflint* /opt/conda/lib
# Copy only necessary parts of /opt/conda
COPY --from=hptt /opt/conda/lib/python3.12/site-packages/hptt \
/opt/conda/lib/python3.12/site-packages/hptt
--
GitLab