From 03d434bb8ee500a8f5c603d0d8434b1ebd866d76 Mon Sep 17 00:00:00 2001
From: Espen Hagen <2492641+espenhgn@users.noreply.github.com>
Date: Thu, 14 Sep 2023 13:53:49 +0200
Subject: [PATCH] Fix text example in Makefile, etc. (#36)

---
 docker/Makefile                                       | 6 +++---
 docker/scripts/apt_get_essential.sh                   | 6 ++++--
 docker/scripts/convert_docker_image_to_singularity.sh | 3 ++-
 docker/scripts/move_singularity_file.sh               | 2 +-
 version/version.py                                    | 2 +-
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/docker/Makefile b/docker/Makefile
index f77aa30..74af3d2 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -7,9 +7,9 @@ all: container_template.sif  # additional .sif files may be listed here for corr
 
 # Example commands executed by this make file
 # 
-# Run "make container_template.sif" will trigger this:
+# Running "make container_template.sif" will issue the following commands:
 # docker build -t container_template -f dockerfiles/container_template/Dockerfile . && \  # build docker container
 #     scripts/convert_docker_image_to_singularity.sh container_template && \         # produces container_template.sif
-#     scripts/scripts/move_singularity_file.sh.sh container_template        # moves container_template.sif to ../singularity/.
+#     scripts/move_singularity_file.sh.sh container_template        # moves container_template.sif to ../singularity/.
 #  
-# Run "make all" will build all singularity containers in this project
+# Running "make all" will build all singularity containers in this project
diff --git a/docker/scripts/apt_get_essential.sh b/docker/scripts/apt_get_essential.sh
index f1e452d..e782893 100644
--- a/docker/scripts/apt_get_essential.sh
+++ b/docker/scripts/apt_get_essential.sh
@@ -1,8 +1,10 @@
 #!/bin/bash
+set -eou pipefail
+
 apt-get update && apt-get install -y  --no-install-recommends \
     apt-utils=2.0.9 \
-    ca-certificates=20211016ubuntu0.20.04.1 \
-    curl=7.68.0-1ubuntu2.15 \
+    ca-certificates=20230311ubuntu0.20.04.1 \
+    curl=7.68.0-1ubuntu2.19 \
     && \
     update-ca-certificates && \
     apt-get clean && \
diff --git a/docker/scripts/convert_docker_image_to_singularity.sh b/docker/scripts/convert_docker_image_to_singularity.sh
index f4e1940..a6296c4 100755
--- a/docker/scripts/convert_docker_image_to_singularity.sh
+++ b/docker/scripts/convert_docker_image_to_singularity.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
-set -e
+set -eou pipefail
+
 # This script documents how to build the singularity container
 # from the Dockerfile
 
diff --git a/docker/scripts/move_singularity_file.sh b/docker/scripts/move_singularity_file.sh
index f162e5d..5df72e5 100755
--- a/docker/scripts/move_singularity_file.sh
+++ b/docker/scripts/move_singularity_file.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # helper script to change ownership to $USER of built container,
 # and moving file to the appropriate directory in repository
-set -e
+set -eou pipefail
 
 if [[ $(/usr/bin/id -u) -ne 0 ]]; then
     echo "Must run script with sudo or as root"
diff --git a/version/version.py b/version/version.py
index c551fa0..34d4cc8 100644
--- a/version/version.py
+++ b/version/version.py
@@ -5,7 +5,7 @@
 _PATCH = "0"
 # This is mainly for nightly builds which have the suffix ".dev$DATE". See
 # https://semver.org/#is-v123-a-semantic-version for the semantics.
-_SUFFIX = "rc2"
+_SUFFIX = "rc3"
 
 VERSION_SHORT = "{0}.{1}".format(_MAJOR, _MINOR)
 VERSION = "{0}.{1}.{2}{3}".format(_MAJOR, _MINOR, _PATCH, _SUFFIX)
\ No newline at end of file