Skip to content

Commit

Permalink
Fix text example in Makefile, etc. (#36)
Browse files Browse the repository at this point in the history
  • Loading branch information
espenhgn authored Sep 14, 2023
1 parent aed3e79 commit 03d434b
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 8 deletions.
6 changes: 3 additions & 3 deletions docker/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 4 additions & 2 deletions docker/scripts/apt_get_essential.sh
Original file line number Diff line number Diff line change
@@ -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 && \
Expand Down
3 changes: 2 additions & 1 deletion docker/scripts/convert_docker_image_to_singularity.sh
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion docker/scripts/move_singularity_file.sh
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion version/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)

0 comments on commit 03d434b

Please sign in to comment.