inkweaver
/
P4-in-a-Bottle
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Updated references to singulartiy in README with apptainer

This commit is contained in:
Jack Yu 2023-05-18 11:04:56 -07:00
parent 39a5f2ed32
commit d8adf910a9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -1,6 +1,6 @@
# Change this to podman if you are on RHEL8+ # Change this to podman if you are on RHEL8+
DOCKER ?= docker DOCKER ?= docker
SINGULARITY ?= singularity APPTAINER ?= apptainer
SHARED_DIR ?= ./shared SHARED_DIR ?= ./shared
OVERLAY_DIR ?= ./overlay OVERLAY_DIR ?= ./overlay
MAX_THREADS ?= 16 MAX_THREADS ?= 16
@ -18,7 +18,7 @@ p4iab.tar.gz: .docker_build
"$(DOCKER)" save p4iab:latest | gzip > "$@" "$(DOCKER)" save p4iab:latest | gzip > "$@"
p4iab.sif: p4iab.def p4iab.tar.gz p4iab.sif: p4iab.def p4iab.tar.gz
sudo "$(SINGULARITY)" build "$@" "$<" sudo "$(APPTAINER)" build "$@" "$<"
sudo chown $(UID):$(GID) "$@" sudo chown $(UID):$(GID) "$@"
run: run:
@ -29,12 +29,12 @@ run:
@"$(DOCKER)" run --rm -it --privileged -v "$(SHARED_DIR):/home/p4/shared" \ @"$(DOCKER)" run --rm -it --privileged -v "$(SHARED_DIR):/home/p4/shared" \
-e TERM -u p4 --entrypoint p4iab_docker_entry.sh p4iab:latest -e TERM -u p4 --entrypoint p4iab_docker_entry.sh p4iab:latest
sc-run: app-run:
@mkdir -p "$(SHARED_DIR)" "$(OVERLAY_DIR)" @mkdir -p "$(SHARED_DIR)" "$(OVERLAY_DIR)"
@test -e p4iab.sif \ @test -e p4iab.sif \
|| (echo Cannot find p4iab.sif, has it been built yet? 1>&2 \ || (echo Cannot find p4iab.sif, has it been built yet? 1>&2 \
&& false) && false)
@sudo singularity run --allow-setuid --overlay "$(OVERLAY_DIR)" \ @sudo $(APPTAINER) run --allow-setuid --overlay "$(OVERLAY_DIR)" \
-B "$(SHARED_DIR):/home/p4/shared" p4iab.sif -B "$(SHARED_DIR):/home/p4/shared" p4iab.sif
clean: clean: