From c235cbee71dc51ac91da14f11f2c9dd5b29366ac Mon Sep 17 00:00:00 2001
From: Axel Kohlmeyer <akohlmey@gmail.com>
Date: Sun, 11 Sep 2022 01:07:22 -0400
Subject: [PATCH] sync with lammps-testing and update plumed version
 consistently.

---
 tools/singularity/almalinux9.def               | 4 ++--
 tools/singularity/centos7.def                  | 2 +-
 tools/singularity/centos8.def                  | 2 +-
 tools/singularity/fedora35_mingw.def           | 2 +-
 tools/singularity/fedora36_mingw.def           | 2 +-
 tools/singularity/rocky8.def                   | 2 +-
 tools/singularity/ubuntu18.04.def              | 2 +-
 tools/singularity/ubuntu18.04_amd_rocm.def     | 2 +-
 tools/singularity/ubuntu18.04_gpu.def          | 2 +-
 tools/singularity/ubuntu18.04_intel_opencl.def | 2 +-
 tools/singularity/ubuntu18.04_nvidia.def       | 2 +-
 tools/singularity/ubuntu20.04.def              | 2 +-
 tools/singularity/ubuntu20.04_amd_rocm.def     | 2 +-
 tools/singularity/ubuntu20.04_gpu.def          | 2 +-
 tools/singularity/ubuntu20.04_intel_opencl.def | 2 +-
 tools/singularity/ubuntu20.04_nvidia.def       | 2 +-
 tools/singularity/ubuntu20.04_oneapi.def       | 2 +-
 tools/singularity/ubuntu22.04.def              | 2 +-
 18 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/tools/singularity/almalinux9.def b/tools/singularity/almalinux9.def
index 37b5703211..3078779957 100644
--- a/tools/singularity/almalinux9.def
+++ b/tools/singularity/almalinux9.def
@@ -44,7 +44,7 @@ From: library/almalinux:9
         # manually install Plumed
         mkdir plumed
         cd plumed
-        version=2.7.3
+        version=2.8.0
         curl -L -o plumed.tar.gz https://github.com/plumed/plumed2/releases/download/v${version}/plumed-src-${version}.tgz
         tar -xzf plumed.tar.gz
         cd plumed-${version}
@@ -75,7 +75,7 @@ EOF
         CUSTOM_PROMPT_ENV=/.singularity.d/env/99-zz_custom_prompt.sh
         cat >$CUSTOM_PROMPT_ENV <<EOF
 #!/bin/bash
-PS1="[alma9:\u@\h] \W> "
+PS1="[almalinux9:\u@\h] \W> "
 EOF
         chmod 755 $CUSTOM_PROMPT_ENV
 
diff --git a/tools/singularity/centos7.def b/tools/singularity/centos7.def
index f418dc8bf0..9e2619e46d 100644
--- a/tools/singularity/centos7.def
+++ b/tools/singularity/centos7.def
@@ -37,7 +37,7 @@ From: centos:7
         # manually install Plumed
         mkdir plumed
         cd plumed
-        version=2.7.3
+        version=2.8.0
         curl -L -o plumed.tar.gz https://github.com/plumed/plumed2/releases/download/v${version}/plumed-src-${version}.tgz
         tar -xzf plumed.tar.gz
         cd plumed-${version}
diff --git a/tools/singularity/centos8.def b/tools/singularity/centos8.def
index aa6d998d4e..081bee238c 100644
--- a/tools/singularity/centos8.def
+++ b/tools/singularity/centos8.def
@@ -42,7 +42,7 @@ From: centos:8
         # manually install Plumed
         mkdir plumed
         cd plumed
-        version=2.7.3
+        version=2.8.0
         curl -L -o plumed.tar.gz https://github.com/plumed/plumed2/releases/download/v${version}/plumed-src-${version}.tgz
         tar -xzf plumed.tar.gz
         cd plumed-${version}
diff --git a/tools/singularity/fedora35_mingw.def b/tools/singularity/fedora35_mingw.def
index c2108a378c..fd026c78d7 100644
--- a/tools/singularity/fedora35_mingw.def
+++ b/tools/singularity/fedora35_mingw.def
@@ -49,7 +49,7 @@ From: fedora:35
         # manually install Plumed
         mkdir plumed
         cd plumed
-        version=2.7.3
+        version=2.8.0
         curl -L -o plumed.tar.gz https://github.com/plumed/plumed2/releases/download/v${version}/plumed-src-${version}.tgz
         tar -xzf plumed.tar.gz
         cd plumed-${version}
diff --git a/tools/singularity/fedora36_mingw.def b/tools/singularity/fedora36_mingw.def
index 79213e9e92..18acf35d4d 100644
--- a/tools/singularity/fedora36_mingw.def
+++ b/tools/singularity/fedora36_mingw.def
@@ -49,7 +49,7 @@ From: fedora:36
         # manually install Plumed
         mkdir plumed
         cd plumed
-        version=2.7.4
+        version=2.8.0
         curl -L -o plumed.tar.gz https://github.com/plumed/plumed2/releases/download/v${version}/plumed-src-${version}.tgz
         tar -xzf plumed.tar.gz
         cd plumed-${version}
diff --git a/tools/singularity/rocky8.def b/tools/singularity/rocky8.def
index 098fd2b868..8e74a28ddc 100644
--- a/tools/singularity/rocky8.def
+++ b/tools/singularity/rocky8.def
@@ -43,7 +43,7 @@ From: rockylinux/rockylinux:8
         # manually install Plumed
         mkdir plumed
         cd plumed
-        version=2.7.3
+        version=2.8.0
         curl -L -o plumed.tar.gz https://github.com/plumed/plumed2/releases/download/v${version}/plumed-src-${version}.tgz
         tar -xzf plumed.tar.gz
         cd plumed-${version}
diff --git a/tools/singularity/ubuntu18.04.def b/tools/singularity/ubuntu18.04.def
index 456d3add56..81fd1159dc 100644
--- a/tools/singularity/ubuntu18.04.def
+++ b/tools/singularity/ubuntu18.04.def
@@ -107,7 +107,7 @@ From: ubuntu:18.04
     # Plumed
     ###########################################################################
 
-    export PLUMED_PKG_VERSION=2.7.4
+    export PLUMED_PKG_VERSION=2.8.0
 
     mkdir plumed
     cd plumed
diff --git a/tools/singularity/ubuntu18.04_amd_rocm.def b/tools/singularity/ubuntu18.04_amd_rocm.def
index febdf1172e..88bed62aae 100644
--- a/tools/singularity/ubuntu18.04_amd_rocm.def
+++ b/tools/singularity/ubuntu18.04_amd_rocm.def
@@ -136,7 +136,7 @@ From: ubuntu:18.04
     # Plumed
     ###########################################################################
 
-    export PLUMED_PKG_VERSION=2.7.4
+    export PLUMED_PKG_VERSION=2.8.0
 
     mkdir plumed
     cd plumed
diff --git a/tools/singularity/ubuntu18.04_gpu.def b/tools/singularity/ubuntu18.04_gpu.def
index 90034285ff..f189768be7 100644
--- a/tools/singularity/ubuntu18.04_gpu.def
+++ b/tools/singularity/ubuntu18.04_gpu.def
@@ -174,7 +174,7 @@ From: ubuntu:18.04
     # Plumed
     ###########################################################################
 
-    export PLUMED_PKG_VERSION=2.7.4
+    export PLUMED_PKG_VERSION=2.8.0
 
     mkdir plumed
     cd plumed
diff --git a/tools/singularity/ubuntu18.04_intel_opencl.def b/tools/singularity/ubuntu18.04_intel_opencl.def
index 1f7c136fac..2b75cf09e1 100644
--- a/tools/singularity/ubuntu18.04_intel_opencl.def
+++ b/tools/singularity/ubuntu18.04_intel_opencl.def
@@ -108,7 +108,7 @@ From: ubuntu:18.04
     # Plumed
     ###########################################################################
 
-    export PLUMED_PKG_VERSION=2.7.4
+    export PLUMED_PKG_VERSION=2.8.0
 
     mkdir plumed
     cd plumed
diff --git a/tools/singularity/ubuntu18.04_nvidia.def b/tools/singularity/ubuntu18.04_nvidia.def
index 1688b89709..bb2535a9c2 100644
--- a/tools/singularity/ubuntu18.04_nvidia.def
+++ b/tools/singularity/ubuntu18.04_nvidia.def
@@ -107,7 +107,7 @@ From: nvidia/cuda:11.6.2-devel-ubuntu18.04
     # Plumed
     ###########################################################################
 
-    export PLUMED_PKG_VERSION=2.7.4
+    export PLUMED_PKG_VERSION=2.8.0
 
     mkdir plumed
     cd plumed
diff --git a/tools/singularity/ubuntu20.04.def b/tools/singularity/ubuntu20.04.def
index 5665546eda..1d1d695b6b 100644
--- a/tools/singularity/ubuntu20.04.def
+++ b/tools/singularity/ubuntu20.04.def
@@ -102,7 +102,7 @@ From: ubuntu:20.04
     # Plumed
     ###########################################################################
 
-    export PLUMED_PKG_VERSION=2.7.4
+    export PLUMED_PKG_VERSION=2.8.0
 
     mkdir plumed
     cd plumed
diff --git a/tools/singularity/ubuntu20.04_amd_rocm.def b/tools/singularity/ubuntu20.04_amd_rocm.def
index 6034014370..f53e899d41 100644
--- a/tools/singularity/ubuntu20.04_amd_rocm.def
+++ b/tools/singularity/ubuntu20.04_amd_rocm.def
@@ -123,7 +123,7 @@ From: ubuntu:20.04
     # Plumed
     ###########################################################################
 
-    export PLUMED_PKG_VERSION=2.7.4
+    export PLUMED_PKG_VERSION=2.8.0
 
     mkdir plumed
     cd plumed
diff --git a/tools/singularity/ubuntu20.04_gpu.def b/tools/singularity/ubuntu20.04_gpu.def
index f7bab1ee9d..5932bb03b5 100644
--- a/tools/singularity/ubuntu20.04_gpu.def
+++ b/tools/singularity/ubuntu20.04_gpu.def
@@ -161,7 +161,7 @@ From: ubuntu:20.04
     # Plumed
     ###########################################################################
 
-    export PLUMED_PKG_VERSION=2.7.4
+    export PLUMED_PKG_VERSION=2.8.0
 
     mkdir plumed
     cd plumed
diff --git a/tools/singularity/ubuntu20.04_intel_opencl.def b/tools/singularity/ubuntu20.04_intel_opencl.def
index c02d2cd3a4..9049e87ebc 100644
--- a/tools/singularity/ubuntu20.04_intel_opencl.def
+++ b/tools/singularity/ubuntu20.04_intel_opencl.def
@@ -101,7 +101,7 @@ From: ubuntu:20.04
     # Plumed
     ###########################################################################
 
-    export PLUMED_PKG_VERSION=2.7.4
+    export PLUMED_PKG_VERSION=2.8.0
 
     mkdir plumed
     cd plumed
diff --git a/tools/singularity/ubuntu20.04_nvidia.def b/tools/singularity/ubuntu20.04_nvidia.def
index a4cdccc49a..9fb2de768b 100644
--- a/tools/singularity/ubuntu20.04_nvidia.def
+++ b/tools/singularity/ubuntu20.04_nvidia.def
@@ -103,7 +103,7 @@ From: nvidia/cuda:11.6.2-devel-ubuntu20.04
     # Plumed
     ###########################################################################
 
-    export PLUMED_PKG_VERSION=2.7.4
+    export PLUMED_PKG_VERSION=2.8.0
 
     mkdir plumed
     cd plumed
diff --git a/tools/singularity/ubuntu20.04_oneapi.def b/tools/singularity/ubuntu20.04_oneapi.def
index a5d59efbc5..1f6d34f7d9 100644
--- a/tools/singularity/ubuntu20.04_oneapi.def
+++ b/tools/singularity/ubuntu20.04_oneapi.def
@@ -140,7 +140,7 @@ From: ubuntu:20.04
     # Plumed
     ###########################################################################
 
-    export PLUMED_PKG_VERSION=2.7.4
+    export PLUMED_PKG_VERSION=2.8.0
 
     mkdir plumed
     cd plumed
diff --git a/tools/singularity/ubuntu22.04.def b/tools/singularity/ubuntu22.04.def
index 62a24e81f3..f20b93c187 100644
--- a/tools/singularity/ubuntu22.04.def
+++ b/tools/singularity/ubuntu22.04.def
@@ -102,7 +102,7 @@ From: ubuntu:22.04
     # Plumed
     ###########################################################################
 
-    export PLUMED_PKG_VERSION=2.7.4
+    export PLUMED_PKG_VERSION=2.8.0
 
     mkdir plumed
     cd plumed