Permalink
Browse files

merging launch-docker-container.sh with dock.sh

  • Loading branch information...
mwiget committed Mar 23, 2018
1 parent b9ae0d7 commit a0959685fe1e313da72cdc7539a6cc58b4d06cf0
Showing with 4 additions and 35 deletions.
  1. +1 −2 Makefile
  2. +0 −33 launch-docker-container.sh
  3. +3 −0 src/scripts/dock.sh
@@ -49,8 +49,7 @@ dist: all
docker:
docker build -t snabb .
@chmod a+rx launch-docker-container.sh
@ln -sf ../launch-docker-container.sh src/snabb
@ln -sf ../src/scripts/dock.sh src/snabb
@echo "Usage: docker run -ti --rm snabb <program> ..."
@echo "or simply call 'src/snabb <program> ...'"
.SERIAL: all

This file was deleted.

Oops, something went wrong.
@@ -1,10 +1,13 @@
#!/usr/bin/env bash
name=$(basename $0)
if [ "$name" != "dock.sh" ]; then export SNABB_TEST_IMAGE=$name; fi
export SNABB_TEST_IMAGE=${SNABB_TEST_IMAGE:=eugeneia/snabb-nfv-test-vanilla}
# Snabb Docker environment
docker run --rm --privileged -i -v $(dirname $PWD):/snabb $DOCKERFLAGS \
--workdir /snabb \
-e SNABB_PCI0=$SNABB_PCI0 \
-e SNABB_PCI1=$SNABB_PCI1 \
-e SNABB_PCI_INTEL0=$SNABB_PCI_INTEL0 \

0 comments on commit a095968

Please sign in to comment.