From 6f7e03ed8fe7113c9380855531c2b15c9c7ba904 Mon Sep 17 00:00:00 2001
From: Daniel Weindl <daniel.weindl@uni-bonn.de>
Date: Mon, 2 Dec 2024 12:36:48 +0100
Subject: [PATCH] Update container files

* activate parpe python environment by default
* fix git_archival.txt / setuptools_scm
* avoid unnecessary full rebuilds when modifying Dockerfile
---
 .gitattributes                                               | 1 -
 container/charliecloud/{parpe_base => }/Dockerfile           | 4 +++-
 .../charliecloud/{parpe_base => container_files}/90forceyes  | 0
 .../charliecloud/{parpe_base => container_files}/config      | 0
 .../charliecloud/{parpe_base => container_files}/gbl_env.sh  | 0
 .../charliecloud/{parpe_base => container_files}/install.sh  | 0
 .../{parpe_base => container_files}/install_parpe.sh         | 0
 doc/parpe_with_charliecloud.md                               | 4 ++--
 python/.git_archival.txt                                     | 5 +----
 9 files changed, 6 insertions(+), 8 deletions(-)
 rename container/charliecloud/{parpe_base => }/Dockerfile (65%)
 rename container/charliecloud/{parpe_base => container_files}/90forceyes (100%)
 rename container/charliecloud/{parpe_base => container_files}/config (100%)
 rename container/charliecloud/{parpe_base => container_files}/gbl_env.sh (100%)
 rename container/charliecloud/{parpe_base => container_files}/install.sh (100%)
 rename container/charliecloud/{parpe_base => container_files}/install_parpe.sh (100%)
 mode change 100644 => 120000 python/.git_archival.txt

diff --git a/.gitattributes b/.gitattributes
index df988ff5b..d619e54d8 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,2 @@
 .git_archival.txt  export-subst
-python/.git_archival.txt  export-subst
 
diff --git a/container/charliecloud/parpe_base/Dockerfile b/container/charliecloud/Dockerfile
similarity index 65%
rename from container/charliecloud/parpe_base/Dockerfile
rename to container/charliecloud/Dockerfile
index 5389e8677..188de5fb6 100644
--- a/container/charliecloud/parpe_base/Dockerfile
+++ b/container/charliecloud/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:24.04
 
-COPY . /container-files
+COPY /container_files /container-files
 
 RUN /container-files/install.sh && rm -rf /tmp && mkdir /tmp
 
@@ -10,6 +10,8 @@ ENV CXX clang++
 ENV OMPI_CC clang
 ENV OMPI_CXX clang++
 RUN /container-files/install_parpe.sh
+# activate virtual Python environment
+RUN echo "source /parPE/build/venv/bin/activate" >> /etc/bash.bashrc
 
 ENV PARPE_DIR "/parPE"
 
diff --git a/container/charliecloud/parpe_base/90forceyes b/container/charliecloud/container_files/90forceyes
similarity index 100%
rename from container/charliecloud/parpe_base/90forceyes
rename to container/charliecloud/container_files/90forceyes
diff --git a/container/charliecloud/parpe_base/config b/container/charliecloud/container_files/config
similarity index 100%
rename from container/charliecloud/parpe_base/config
rename to container/charliecloud/container_files/config
diff --git a/container/charliecloud/parpe_base/gbl_env.sh b/container/charliecloud/container_files/gbl_env.sh
similarity index 100%
rename from container/charliecloud/parpe_base/gbl_env.sh
rename to container/charliecloud/container_files/gbl_env.sh
diff --git a/container/charliecloud/parpe_base/install.sh b/container/charliecloud/container_files/install.sh
similarity index 100%
rename from container/charliecloud/parpe_base/install.sh
rename to container/charliecloud/container_files/install.sh
diff --git a/container/charliecloud/parpe_base/install_parpe.sh b/container/charliecloud/container_files/install_parpe.sh
similarity index 100%
rename from container/charliecloud/parpe_base/install_parpe.sh
rename to container/charliecloud/container_files/install_parpe.sh
diff --git a/doc/parpe_with_charliecloud.md b/doc/parpe_with_charliecloud.md
index 3bbab213d..9db3ca78e 100644
--- a/doc/parpe_with_charliecloud.md
+++ b/doc/parpe_with_charliecloud.md
@@ -22,8 +22,8 @@ This will create the parPE base image *from parPE from github*
 takes about 10'):
 
 ```shell
-git archive -v -o container/charliecloud/parpe_base/parpe.tar.gz --format=tar.gz HEAD
-cd container/charliecloud/parpe_base
+git archive -v -o container/charliecloud/container_files/parpe.tar.gz --format=tar.gz HEAD
+cd container/charliecloud/
 ch-build -t parpe .
 ```
 
diff --git a/python/.git_archival.txt b/python/.git_archival.txt
deleted file mode 100644
index 2b181ff6f..000000000
--- a/python/.git_archival.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-node: $Format:%H$
-node-date: $Format:%cI$
-describe-name: $Format:%(describe:tags=true,match=*[0-9]*)$
-
diff --git a/python/.git_archival.txt b/python/.git_archival.txt
new file mode 120000
index 000000000..d7a42b253
--- /dev/null
+++ b/python/.git_archival.txt
@@ -0,0 +1 @@
+../.git_archival.txt
\ No newline at end of file