From 72af188173a3d57b4304fe750ee09af160dfe6cd Mon Sep 17 00:00:00 2001
From: Florent Pruvost <florent.pruvost@inria.fr>
Date: Tue, 3 Dec 2024 13:40:00 +0100
Subject: [PATCH] Dockerfile: Add default environment variables
---
.gitlab/Dockerfile | 5 +++++
.gitlab/Dockerfile-pages | 5 +++++
.gitlab/build.sh | 4 ++--
tools/pages.sh | 6 ------
4 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/.gitlab/Dockerfile b/.gitlab/Dockerfile
index 1cf0f9e9f..c4799ec2f 100644
--- a/.gitlab/Dockerfile
+++ b/.gitlab/Dockerfile
@@ -81,3 +81,8 @@ RUN cd starpu-1.4.7/ && \
rm starpu-1.4.7.tar.gz
USER gitlab
+
+# Set some default environment variables
+ENV LIBRARY_PATH=/usr/local/lib
+ENV LD_LIBRARY_PATH=/usr/local/lib
+ENV PKG_CONFIG_PATH=/home/gitlab/install/starpu/lib/pkgconfig
diff --git a/.gitlab/Dockerfile-pages b/.gitlab/Dockerfile-pages
index df216af38..441685f58 100644
--- a/.gitlab/Dockerfile-pages
+++ b/.gitlab/Dockerfile-pages
@@ -33,3 +33,8 @@ RUN apt-get autoclean -y
RUN apt-get purge -y
USER gitlab
+
+# Set some default environment variables
+ENV LIBRARY_PATH=/usr/local/lib
+ENV LD_LIBRARY_PATH=/usr/local/lib
+ENV PKG_CONFIG_PATH=/home/gitlab/install/starpu/lib/pkgconfig
diff --git a/.gitlab/build.sh b/.gitlab/build.sh
index bdfe6baec..370b00f1e 100755
--- a/.gitlab/build.sh
+++ b/.gitlab/build.sh
@@ -83,8 +83,8 @@ if [[ "$SYSTEM" == "guix" ]]; then
export LIBRARY_PATH=$PWD/../../install-${VERSION}/lib:$LIBRARY_PATH
export LD_LIBRARY_PATH=$PWD/../../install-${VERSION}/lib:$LD_LIBRARY_PATH
elif [[ "$SYSTEM" == "linux" ]]; then
- export LIBRARY_PATH=$PWD/../../install-${VERSION}/lib:$LIBRARY_PATH:/usr/local/lib
- export LD_LIBRARY_PATH=$PWD/../../install-${VERSION}/lib:$LD_LIBRARY_PATH:/usr/local/lib
+ export LIBRARY_PATH=$PWD/../../install-${VERSION}/lib:$LIBRARY_PATH
+ export LD_LIBRARY_PATH=$PWD/../../install-${VERSION}/lib:$LD_LIBRARY_PATH
elif [[ "$SYSTEM" == "macosx" ]]; then
export LIBRARY_PATH=$PWD/../../install-${VERSION}/lib:$LIBRARY_PATH
export DYLD_LIBRARY_PATH=$PWD/../../install-${VERSION}/lib:$DYLD_LIBRARY_PATH
diff --git a/tools/pages.sh b/tools/pages.sh
index 7d03463d3..98f170243 100755
--- a/tools/pages.sh
+++ b/tools/pages.sh
@@ -13,12 +13,6 @@ set -e
set -x
CHAMELEON_SRC_DIR=${CHAMELEON_SRC_DIR:-$PWD}
-# where is installed starpu in the docker image
-CURRENTUSER=`whoami`
-if [[ -f /.dockerenv && $CURRENTUSER == "gitlab" ]]; then
- export PKG_CONFIG_PATH=/home/gitlab/install/starpu/lib/pkgconfig:$PKG_CONFIG_PATH
-fi
-
mkdir -p tmp_fig
cd tmp_fig
--
GitLab