Skip to content

use unionfs overlay tool (+ debian12 build container that includes it) by default #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 1, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/test_eessi_container_script.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
- name: Test eessi_container.sh script
run: |
test_cmd="cat /etc/os-release"
out_pattern="Debian GNU/Linux 11"
out_pattern="Debian GNU/Linux 12"

if [[ ${{matrix.SCRIPT_TEST}} == 'help' ]]; then
./eessi_container.sh --help
Expand Down Expand Up @@ -116,7 +116,7 @@ jobs:
rm -f ${outfile}

# make sure that container image exists
test -f ${tmpdir}/ghcr.io_eessi_build_node_debian11.sif || (echo "Container image not found in ${tmpdir}" >&2 && ls ${tmpdir} && exit 1)
test -f ${tmpdir}/ghcr.io_eessi_build_node_debian12.sif || (echo "Container image not found in ${tmpdir}" >&2 && ls ${tmpdir} && exit 1)

./eessi_container.sh --verbose --resume ${tmpdir} --mode shell <<< "${test_cmd}" > ${outfile}
cat ${outfile}
Expand Down
8 changes: 4 additions & 4 deletions eessi_container.sh
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ display_help() {
echo " To specify multiple bind paths, separate by comma."
echo " Example: '/src:/dest:ro,/src2:/dest2:rw'"
echo " -c | --container IMG - image file or URL defining the container to use"
echo " [default: docker://ghcr.io/eessi/build-node:debian11]"
echo " [default: docker://ghcr.io/eessi/build-node:debian12]"
echo " -f | --fakeroot - run the container with --fakeroot [default: false]"
echo " -g | --storage DIR - directory space on host machine (used for"
echo " temporary data) [default: 1. TMPDIR, 2. /tmp]"
Expand All @@ -92,7 +92,7 @@ display_help() {
echo " attach a GPU, MODE==all for both [default: false]"
echo " -o | --overlay-tool ARG - tool to use to create (read-only or writable) overlay;"
echo " selected tool *must* be available in container image being used;"
echo " can be 'fuse-overlayfs' or 'unionfs' [default: fuse-overlayfs]"
echo " can be 'fuse-overlayfs' or 'unionfs' [default: unionfs]"
echo " -p | --pass-through ARG - argument to pass through to the launch of the"
echo " container; can be given multiple times [default: not set]"
echo " -r | --repository CFG - configuration file or identifier defining the"
Expand Down Expand Up @@ -125,14 +125,14 @@ display_help() {

# set defaults for command line arguments
ACCESS="ro"
CONTAINER="docker://ghcr.io/eessi/build-node:debian11"
CONTAINER="docker://ghcr.io/eessi/build-node:debian12"
#DRY_RUN=0
FAKEROOT=0
VERBOSE=0
STORAGE=
LIST_REPOS=0
MODE="shell"
OVERLAY_TOOL="fuse-overlayfs"
OVERLAY_TOOL="unionfs"
PASS_THROUGH=()
SETUP_NVIDIA=0
REPOSITORIES=()
Expand Down