From 73cf9518b45bdd99e2b50869d86522990e8e8b53 Mon Sep 17 00:00:00 2001
From: Ujwal Kundur <ujwal.kundur@gmail.com>
Date: Thu, 23 Jun 2022 13:40:17 +0530
Subject: [PATCH] Test fix 6.9
Source setvars.sh from /etc/profile while using bash login shell.
---
containers/oneapi/onedev.Dockerfile | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/containers/oneapi/onedev.Dockerfile b/containers/oneapi/onedev.Dockerfile
index b4b5dccf5..143b3f6bb 100644
--- a/containers/oneapi/onedev.Dockerfile
+++ b/containers/oneapi/onedev.Dockerfile
@@ -319,15 +319,14 @@ ARG AFTERBURNER_VERSION=main
RUN echo "" >> /etc/jug_info \
&& echo " - jug_dev: ${JUG_VERSION}" >> /etc/jug_info
-## make entrypoint executable
-RUN chmod +x /usr/local/sbin/entrypoint.sh
+## make entrypoint executable and set up oneAPI environment
+RUN chmod +x /usr/local/sbin/entrypoint.sh \
+ && echo "source /opt/intel/oneapi/setvars.sh --force 2> /dev/null" \
+ >> /etc/profile
## make sure we have the entrypoints setup correctly
ENTRYPOINT ["/usr/local/sbin/entrypoint.sh"]
-
-## set up oneAPI environment while using login (-l) shell
-CMD ["bash", "--rcfile", "/etc/profile", "-l", "-c", \
- "source /opt/intel/oneapi/setvars.sh --force 2> /dev/null"]
+CMD ["bash", "--rcfile", "/etc/profile", "-l"]
USER 0
WORKDIR /
SHELL ["/usr/local/bin/eic-shell"]
--
GitLab