From 6cc4d272f9723e5d3fb7b2cef22b1ca5f7277465 Mon Sep 17 00:00:00 2001
From: Gabriel Studer <gabriel.studer@unibas.ch>
Date: Wed, 18 Nov 2020 16:01:39 +0100
Subject: [PATCH] update containers
---
container/Dockerfile | 2 +-
container/Singularity | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/container/Dockerfile b/container/Dockerfile
index 0c09764e..20a1c805 100644
--- a/container/Dockerfile
+++ b/container/Dockerfile
@@ -1,4 +1,4 @@
-ARG OPENSTRUCTURE_IMAGE_TAG="2.2.0-bionic"
+ARG OPENSTRUCTURE_IMAGE_TAG="2.2.0-focal"
FROM registry.scicore.unibas.ch/schwede/openstructure:${OPENSTRUCTURE_IMAGE_TAG}
# ARGUMENTS
diff --git a/container/Singularity b/container/Singularity
index 6932ddfd..ccb464c7 100644
--- a/container/Singularity
+++ b/container/Singularity
@@ -1,5 +1,5 @@
BootStrap: docker
-From: registry.scicore.unibas.ch/schwede/promod3:3.2.0-OST2.2.0-bionic
+From: registry.scicore.unibas.ch/schwede/promod3:3.2.0-OST2.2.0-focal
%post
##############################################################################
# POST
@@ -42,7 +42,7 @@ cat > $JUPYTER_PATH/kernels/ost-kernel/kernel.json <<EOF
"-m", "ipykernel",
"-f", "{connection_file}",
"--InteractiveShellApp.exec_PYTHONSTARTUP=False",
- "--InteractiveShellApp.exec_files=['/usr/local/lib64/python3.6/site-packages/ost/ost_startup.py']"
+ "--InteractiveShellApp.exec_files=['/usr/local/lib64/python3.8/site-packages/ost/ost_startup.py']"
],
"env": {
}
@@ -200,7 +200,7 @@ and goes to CWD. Thus this sould work as expected out of the box.
# NOTEBOOK ENV
##############################################################################
export DNG_ROOT=$OST_ROOT
-export DNG_INITDIR=${DNG_ROOT}/lib64/python3.6/site-packages/ost
+export DNG_INITDIR=${DNG_ROOT}/lib64/python3.8/site-packages/ost
%apprun IPython
--
GitLab