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

Enhanced Makefile runscript and simplified using pre-built images

Browse source
This commit is contained in:
Jack Yu 2023-05-18 03:45:12 -07:00
commit 102b065fab
2 changed files with 22 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Makefile
View file

@ -21,13 +21,21 @@ p4iab.sif: p4iab.def p4iab.tar.gz
sudo "$(SINGULARITY)" build "$@" "$<"
sudo chown $(UID):$(GID) "$@"
run: .docker_build
mkdir -p "$(SHARED_DIR)"
"$(DOCKER)" run --rm -it --privileged -v "$(SHARED_DIR):/home/p4/shared" -e TERM -u p4 --entrypoint p4iab_docker_entry.sh p4iab:latest
run:
@mkdir -p "$(SHARED_DIR)"
@test -n "$(shell docker image ls -q p4iab)" \
|| (echo Cannot find image p4iab:latest, has it been built yet? \
&& false)
@"$(DOCKER)" run --rm -it --privileged -v "$(SHARED_DIR):/home/p4/shared" \
-e TERM -u p4 --entrypoint p4iab_docker_entry.sh p4iab:latest
sc-run: p4iab.sif
mkdir -p "$(SHARED_DIR)" "$(OVERLAY_DIR)"
sudo singularity run --allow-setuid --overlay "$(OVERLAY_DIR)" -B "$(SHARED_DIR):/home/p4/shared" "$<"
sc-run:
@mkdir -p "$(SHARED_DIR)" "$(OVERLAY_DIR)"
@test -e p4iab.sif \
|| (echo Cannot find p4iab.sif, has it been built yet? \
&& false)
@sudo singularity run --allow-setuid --overlay "$(OVERLAY_DIR)" \
-B "$(SHARED_DIR):/home/p4/shared" p4iab.sif
clean:
"$(DOCKER)" container prune