Merge pull request #85 from NERSC/fuse-fix

fixes for fuse wrapper and prep for new release

CHANGELOG.md

@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.0.3] - 2023-09-01
+
+This is a minor release that fixes several bugs.
+
+- Fixes issue using userns keep-id for squashed images (#83)
+- Fixes inconsistencies in pull, build, and run settings (#81, #80, #76). Makes it possible for users to override default settings and provide their own.
+
 ## [1.0.2] - 2023-06-15
 
 This is a minor release that fixes several additional bugs.

README.md

@@ -25,8 +25,7 @@ The list of configurable values is:
 * shared_run_command: (list) command to run in the shared_run container (default: sleep infinity)
 * graph_root: (str) directory for the graph root (default: /tmp/{uid}_hpc/storage)
 * run_root: (str) directory for teh run root (default: /tmp/{uid}_hpc)
-* default_args: additional arguments to pass to podman (future)
-* default_run_args: additional run arguments (future)
+* use_default_args: (bool) default True. User can set to False to turn off all defaults, and must provide all settings themselves.
 * additional_stores: (list) additional storage areas
 * hooks_dir: (str) directory for hooks. Note: this should have the podman_hpc hooks tool configured.
 * config_home: (str) directory where the generated configuration files will be written and XDG_CONFIG_HOME will be set.

bin/fuse-overlayfs-wrap

@@ -25,16 +25,24 @@ fi
 F=$(echo $@|sed 's/,upperdir.*//'|sed 's/.*lowerdir=//'|sed 's/.*://')
 echo "In fow $F.squash" >> $LOG
 if [ -e "${F}.squash" ] ; then
-	echo "Mount suash $F" >> $LOG
-	/usr/bin/squashfuse $F.squash $F >> $LOG 2>&1
+        echo "Mount squash $F" >> $LOG
+        /usr/bin/squashfuse $F.squash $F >> $LOG 2>&1
 fi
 
 #echo "Doing fuse mount" >> $LOG
-/usr/bin/fuse-overlayfs $@
+/usr/bin/fuse-overlayfs $@ >> $LOG 2>&1
+RET=$?
+D=$(echo $@|sed 's/.* //')
+chmod a+rx ${D}
+echo "$D" >> $LOG
+ls -ld $D >> $LOG
 
 # Start a process to watch the mount and unmount squash
 # if possible
 if [ -e "${F}.squash" ] ; then
-	D=$(echo $@|sed 's/.* //')
-	$0 wait $D $F  0<&- &>/dev/null &
+        D=$(echo $@|sed 's/.* //')
+        $0 wait $D $F  0<&- &>/dev/null &
 fi
+
+#sleep infinity
+exit $RET

etc/podman_hpc.yaml

@@ -3,8 +3,6 @@ mount_program: "/usr/bin/fuse-overlayfs-wrap"
 modules_dir: "/etc/podman_hpc/modules.d"
 shared_run_exec_args: ["-e", "SLURM_*", "-e", "PALS_*", "-e", "PMI_*"]
 shared_run_command: ["sleep", "infinity"]
-default_args: []
-default_run_args: []
 hooks_dir: "/usr/share/containers/oci/hooks.d"
 localid_var: "SLURM_LOCALID"
 tasks_per_node_var: "SLURM_STEP_TASKS_PER_NODE"

podman-hpc.spec

@@ -14,7 +14,7 @@
 
 
 Name:           podman-hpc
-Version:        1.0.2
+Version:        1.0.3
 Release:        1
 Summary:	Scripts to enable Podman to run in an HPC environment
 # FIXME: Select a correct license from https://github.com/openSUSE/spec-cleaner#spdx-licenses

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = podman-hpc
-version = 1.0.2
+version = 1.0.3
 
 [options]
 packages = podman_hpc