From fd8f666c606ca9a1dd91b5f1e7fc04ef9d16963f Mon Sep 17 00:00:00 2001
From: Whitney Armstrong <warmstrong@anl.gov>
Date: Sun, 27 Sep 2020 20:34:15 -0500
Subject: [PATCH] Don't package root script gcc version
- don't install a root wrapper script (sometimes breaks root when working in the
container)
- gaudi tag stuck on gcc 9
---
containers/builder/Dockerfile | 2 +-
deploy.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/containers/builder/Dockerfile b/containers/builder/Dockerfile
index 697eaf47f..b225b4353 100644
--- a/containers/builder/Dockerfile
+++ b/containers/builder/Dockerfile
@@ -81,7 +81,7 @@ RUN cd /opt/spack-environment \
&& spack env activate . \
&& export PODIO=`spack find -p podio | grep software | awk '{print $2}'` \
&& echo "export PODIO=${PODIO};" >> /etc/profile.d/z10_spack_environment.sh \
- && echo "export BINARY_TAG=x86_64-linux-gcc10-opt" >> /etc/profile.d/z10_spack_environment.sh
+ && echo "export BINARY_TAG=x86_64-linux-gcc9-opt" >> /etc/profile.d/z10_spack_environment.sh
## make sure we have the entrypoints setup correctly
ENTRYPOINT []
diff --git a/deploy.py b/deploy.py
index dbc648021..f1e713bbf 100755
--- a/deploy.py
+++ b/deploy.py
@@ -26,7 +26,7 @@ IMAGE_ROOT='eic'
PROGRAMS = ['eic-shell',
'container_dev',
- 'root',
+ #'root',
'ipython']
## URL for the current container (git tag will be filled in by the script)
--
GitLab