From e4683da39e65b7dd855625b5ee1f927654fa7d48 Mon Sep 17 00:00:00 2001
From: Ujwal Kundur <ujwal.kundur@gmail.com>
Date: Thu, 23 Jun 2022 09:27:43 +0530
Subject: [PATCH] Test fix 6.6

Source setvars.sh using a new entrypoint script.
---
 containers/oneapi/onedev.Dockerfile | 2 +-
 containers/oneapi/oneentrypoint.sh  | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 containers/oneapi/oneentrypoint.sh

diff --git a/containers/oneapi/onedev.Dockerfile b/containers/oneapi/onedev.Dockerfile
index 52f2f1497..81705b527 100644
--- a/containers/oneapi/onedev.Dockerfile
+++ b/containers/oneapi/onedev.Dockerfile
@@ -215,7 +215,7 @@ RUN spack debug report                                                  \
 
 COPY eic-shell /usr/local/bin/eic-shell
 COPY eic-info /usr/local/bin/eic-info
-COPY entrypoint.sh /usr/local/sbin/entrypoint.sh
+COPY oneentrypoint.sh /usr/local/sbin/entrypoint.sh
 COPY eic-env.sh /etc/eic-env.sh
 COPY profile.d/a00_cleanup.sh /etc/profile.d
 COPY profile.d/z11_jug_env.sh /etc/profile.d
diff --git a/containers/oneapi/oneentrypoint.sh b/containers/oneapi/oneentrypoint.sh
new file mode 100644
index 000000000..8a98d97ef
--- /dev/null
+++ b/containers/oneapi/oneentrypoint.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+## Force environment to be clean
+. /etc/eic-env.sh
+
+## Source OneAPI environment
+. /opt/intel/oneapi/setvars.sh --force 2> /dev/null
+
+exec "$@"
-- 
GitLab