Introduce 'make run' to run the respective container

11 files changed, 14 insertions, 12 deletions

diff --git a/ggsn-test/Makefile b/ggsn-test/Makefile
index 8d0e10b..1343c08 100644
--- a/ggsn-test/Makefile
+++ b/ggsn-test/Makefile
@@ -1 +1,3 @@
+RUN_ARGS?=run --rm --network sigtran --ip 172.18.0.202 -v ggsn-test-vol:/data
+
 include ../make/Makefile
diff --git a/ggsn-test/start.sh b/ggsn-test/start.sh
deleted file mode 100755
index 553f2b2..0000000
--- a/ggsn-test/start.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-docker volume rm ggsn-test-vol
-docker run --rm --network sigtran --ip 172.18.0.202 -v ggsn-test-vol:/data -it ggsn-test
diff --git a/m3ua-test/Makefile b/m3ua-test/Makefile
index 8d0e10b..7de0218 100644
--- a/m3ua-test/Makefile
+++ b/m3ua-test/Makefile
@@ -1 +1,3 @@
+RUN_ARGS?=--rm --network sigtran --ip 172.18.0.2
+
 include ../make/Makefile
diff --git a/m3ua-test/start.sh b/m3ua-test/start.sh
deleted file mode 100755
index aa2ae5f..0000000
--- a/m3ua-test/start.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-docker run --rm --network sigtran --ip 172.18.0.2 -it m3ua-test
diff --git a/make/Makefile b/make/Makefile
index 5ce888c..d81d0fb 100644
--- a/make/Makefile
+++ b/make/Makefile
@@ -106,3 +106,7 @@ check-status:
 check-release: .release
 	@. $(RELEASE_SUPPORT) ; tagExists $(TAG) || (echo "ERROR: version not yet tagged in git. make [minor,major,patch]-release." >&2 && exit 1) ;
 	@. $(RELEASE_SUPPORT) ; ! differsFromRelease $(TAG) || (echo "ERROR: current directory differs from tagged $(TAG). make [minor,major,patch]-release." ; exit 1)
+
+
+run:
+	docker run $(RUN_ARGS) -it $(NAME)
diff --git a/osmo-ggsn-master/Makefile b/osmo-ggsn-master/Makefile
index 8d0e10b..7c73730 100644
--- a/osmo-ggsn-master/Makefile
+++ b/osmo-ggsn-master/Makefile
@@ -1 +1,3 @@
+RUN_ARGS?= --cap-add=NET_ADMIN --device /dev/net/tun:/dev/net/tun --rm --network sigtran --ip 172.18.0.201 -v ggsn-vol:/data
+
 include ../make/Makefile
diff --git a/osmo-ggsn-master/start.sh b/osmo-ggsn-master/start.sh
deleted file mode 100755
index 2a3afd5..0000000
--- a/osmo-ggsn-master/start.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-docker volume rm ggsn-vol
-docker run --cap-add=NET_ADMIN --device /dev/net/tun:/dev/net/tun --rm --network sigtran --ip 172.18.0.201 -v ggsn-vol:/data -it osmo-ggsn-master
diff --git a/osmo-stp-master/Makefile b/osmo-stp-master/Makefile
index 8d0e10b..20ed99c 100644
--- a/osmo-stp-master/Makefile
+++ b/osmo-stp-master/Makefile
@@ -1 +1,3 @@
+RUN_ARGS?=--rm --network sigtran --ip 172.18.0.200
+
 include ../make/Makefile
diff --git a/osmo-stp-master/start.sh b/osmo-stp-master/start.sh
deleted file mode 100755
index 65ae30c..0000000
--- a/osmo-stp-master/start.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-docker run --rm --network sigtran --ip 172.18.0.200 -it osmo-stp-master
diff --git a/sua-test/Makefile b/sua-test/Makefile
index 8d0e10b..b7a6cb8 100644
--- a/sua-test/Makefile
+++ b/sua-test/Makefile
@@ -1 +1,3 @@
+RUN_ARGS?=--rm --network sigtran --ip 172.18.0.3
+
 include ../make/Makefile
diff --git a/sua-test/start.sh b/sua-test/start.sh
deleted file mode 100755
index 01dbb78..0000000
--- a/sua-test/start.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-docker run --rm --network sigtran --ip 172.18.0.3 -it sua-test