From 74704c02de7cfe364a539ead1f4f7cd0307d6058 Mon Sep 17 00:00:00 2001
From: Stefan Bienert <stefan.bienert@unibas.ch>
Date: Tue, 25 Feb 2020 15:23:10 +0100
Subject: [PATCH] Put SIngularity under bump_version.py control
---
scripts/bump-version.py | 10 ++++++++++
singularity/Singularity | 3 +--
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/scripts/bump-version.py b/scripts/bump-version.py
index 367b3f635..361e78772 100755
--- a/scripts/bump-version.py
+++ b/scripts/bump-version.py
@@ -35,3 +35,13 @@ for i, line in enumerate(lines):
if line.startswith("ARG OPENSTRUCTURE_VERSION"):
lines[i] = 'ARG OPENSTRUCTURE_VERSION="%s"\n' % version_string
open("docker/Dockerfile", "w").writelines(lines)
+
+# fix Singularity recipe
+vfile = "singularity/Singularity"
+lines = open(vfile).readlines()
+for i, line in enumerate(lines):
+ if line.startswith("From: registry.scicore.unibas.ch/schwede/openstructure:"):
+ lines[i] = 'From: registry.scicore.unibas.ch/schwede/openstructure:'+\
+ '"%s"' % version_string
+ break
+open(vfile, "w").writelines(lines)
diff --git a/singularity/Singularity b/singularity/Singularity
index 3a3889f20..9d1a3d96b 100644
--- a/singularity/Singularity
+++ b/singularity/Singularity
@@ -1,6 +1,5 @@
BootStrap: docker
-From: registry.scicore.unibas.ch/schwede/openstructure:python3_test2
-
+From: registry.scicore.unibas.ch/schwede/openstructure:"2.0.0"
%post
##############################################################################
--
GitLab