Add osmo-gbproxy-* container for osmo-gbproxy

Uses the new repo split off of osmo-sgsn

Related: OS#4992
Change-Id: I1e7ede4d1da54e3bcb286213b34401bd9dcf7cc1

7 files changed, 107 insertions, 16 deletions

diff --git a/make/Makefile b/make/Makefile
index 7bb0345..5280bef 100644
--- a/make/Makefile
+++ b/make/Makefile
@@ -21,6 +21,7 @@ OSMO_TTCN3_BRANCH?=master
 OSMO_BB_BRANCH?=master
 OSMO_BSC_BRANCH?=master
 OSMO_BTS_BRANCH?=master
+OSMO_GBPROXY_BRANCH?=master
 OSMO_GGSN_BRANCH?=master
 OSMO_GSM_TESTER_BRANCH?=master
 OSMO_HLR_BRANCH?=master
@@ -74,6 +75,7 @@ docker-build: .release
 		--build-arg OSMO_BB_BRANCH=$(OSMO_BB_BRANCH) \
 		--build-arg OSMO_BSC_BRANCH=$(OSMO_BSC_BRANCH) \
 		--build-arg OSMO_BTS_BRANCH=$(OSMO_BTS_BRANCH) \
+		--build-arg OSMO_GBPROXY_BRANCH=$(OSMO_GBPROXY_BRANCH) \
 		--build-arg OSMO_GGSN_BRANCH=$(OSMO_GGSN_BRANCH) \
 		--build-arg OSMO_GSM_TESTER_BRANCH=$(OSMO_GSM_TESTER_BRANCH) \
 		--build-arg OSMO_HLR_BRANCH=$(OSMO_HLR_BRANCH) \
diff --git a/osmo-gbproxy-master/Dockerfile b/osmo-gbproxy-master/Dockerfile
index 8661ec9..9df1ee7 100644
--- a/osmo-gbproxy-master/Dockerfile
+++ b/osmo-gbproxy-master/Dockerfile
@@ -1,6 +1,69 @@
 ARG	USER
 ARG	DISTRO
-FROM	$USER/osmo-sgsn-master
+FROM	$USER/$DISTRO-build
+# Arguments used after FROM must be specified again
+ARG	DISTRO
+ARG	OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
+
+MAINTAINER Harald Welte <laforge@gnumonks.org>
+
+ARG	OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/Debian_9.0/"
+
+COPY	Release.key /tmp/Release.key
+
+RUN	case "$DISTRO" in \
+	debian*) \
+		apt-key add /tmp/Release.key && \
+		rm /tmp/Release.key && \
+		echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list \
+		;; \
+	esac
+
+# we need to add this to invalidate the cache once the repository is updated.
+# unfortunately Dockerfiles don't support a conditional ARG, so we need to add both DPKG + RPM
+ADD	$OSMOCOM_REPO/Release /tmp/Release
+ADD	$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/CentOS_8/repodata/repomd.xml /tmp/repomd.xml
+RUN	case "$DISTRO" in \
+	debian*) \
+		apt-get update && \
+		apt-get install -y --no-install-recommends \
+			telnet \
+			libosmocore-dev \
+			libosmo-abis-dev \
+			libosmo-netif-dev \
+		&& \
+		apt-get clean \
+		;; \
+	centos*) \
+		dnf install -y \
+			telnet \
+			"pkgconfig(libosmo-netif)" \
+			"pkgconfig(libosmoabis)" \
+			"pkgconfig(libosmocore)" \
+			"pkgconfig(libosmoctrl)" \
+			"pkgconfig(libosmogb)" \
+			"pkgconfig(libosmogsm)" \
+			"pkgconfig(libosmovty)" \
+			;; \
+	esac
+
+WORKDIR	/tmp
+
+ARG	OSMO_GBPROXY_BRANCH="master"
+
+RUN	git clone git://git.osmocom.org/osmo-gbproxy.git
+ADD	http://git.osmocom.org/osmo-gbproxy/patch?h=$OSMO_GBPROXY_BRANCH /tmp/commit
+
+RUN	cd osmo-gbproxy && \
+	git fetch && git checkout $OSMO_GBPROXY_BRANCH && \
+	(git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_GBPROXY_BRANCH || exit 1); \
+	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
+	autoreconf -fi && \
+	./configure && \
+	make "-j$(nproc)" install && \
+	ldconfig
+
+VOLUME	/data
 
 COPY	osmo-gbproxy.cfg 	/data/osmo-gbproxy.cfg
 
diff --git a/osmo-gbproxy-master/Makefile b/osmo-gbproxy-master/Makefile
index 1614f9a..9e5fb05 100644
--- a/osmo-gbproxy-master/Makefile
+++ b/osmo-gbproxy-master/Makefile
@@ -1,3 +1,3 @@
-RUN_ARGS?=--rm --network sigtran --ip 172.18.0.21 -v gbproxy-vol:/data
+RUN_ARGS?=--rm --network sigtran --ip 172.18.0.22 -v gbproxy-vol:/data
 
 include ../make/Makefile
diff --git a/osmo-gbproxy-master/Release.key b/osmo-gbproxy-master/Release.key
new file mode 100644
index 0000000..a737316
--- /dev/null
+++ b/osmo-gbproxy-master/Release.key
@@ -0,0 +1,20 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc
+a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl
+CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4
+5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee
+S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y
+CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy
+b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCXm/4
+pgIbAwUJEEzwqgYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3f/1AH
+/A7WVSpfM4wV/DMqZPTsSjChB4JyDotxpV7qHZzBC5aaP2dINZyi9PayIwZWbvCY
+VKvt+Fw8oCGC9F9mdh10Xe+ElHeVNSihzABPuu1RkRkb1nvkymScy0yxydodYOBi
+K4WQ+BhpijXWmYvOekIwbS5Hi9BHpfgK4TinK0xsvh1bVLeQJ8YjrnNFIAR2CnBa
+X7Y72Up/kKL08DdQzuS+mKrJtAQlGMtIsukWC2ajYQMkNwm8Gvhpn8za113dCkBW
+XAFnlQqQobKwC7b19QgEtJI/YpGSrRc6WaZxPyAjscbWQlFEAB900sVj4BWT55ig
+7O2uSdsCVhTuU7T0ztwsgvmIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v
+d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4=
+=/Tek
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/osmo-gbproxy-master/osmo-gbproxy.cfg b/osmo-gbproxy-master/osmo-gbproxy.cfg
index 29f698f..dec0608 100644
--- a/osmo-gbproxy-master/osmo-gbproxy.cfg
+++ b/osmo-gbproxy-master/osmo-gbproxy.cfg
@@ -2,17 +2,28 @@
 ! Osmocom Gb Proxy (0.9.0.404-6463) configuration saved from vty
 !!
 !
+log stderr
+ logging filter all 1
+ logging color 1
+ logging print category 1
+ logging print category-hex 0
+ logging timestamp 1
+ logging print file 1
+ logging level lns debug
+ logging level lbssgp debug
+ logging level gprs debug
 line vty
  no login
+ bind 0.0.0.0
 !
-gbproxy
- sgsn nsei 101
+sgsn nsei 101
+ name main
 ns
- nse 101 nsvci 101
- nse 101 remote-role sgsn
- nse 101 encapsulation udp
- nse 101 remote-ip 192.168.100.239
- nse 101 remote-port 7777
+ bind udp local
+  listen 0.0.0.0 23000
+  accept-ipaccess
+ nse 101
+  nsvc ipa local 172.18.0.21 23000 nsvci 2342
  timer tns-block 3
  timer tns-block-retries 3
  timer tns-reset 3
@@ -20,7 +31,3 @@ ns
  timer tns-test 30
  timer tns-alive 3
  timer tns-alive-retries 10
- encapsulation framerelay-gre enabled 0
- encapsulation framerelay-gre local-ip 0.0.0.0
- encapsulation udp local-ip 127.0.0.100
- encapsulation udp local-port 23000
diff --git a/ttcn3-gbproxy-test-fr/jenkins.sh b/ttcn3-gbproxy-test-fr/jenkins.sh
index 78d98e2..863e8ef 100755
--- a/ttcn3-gbproxy-test-fr/jenkins.sh
+++ b/ttcn3-gbproxy-test-fr/jenkins.sh
@@ -16,7 +16,6 @@
 . ../jenkins-common.sh
 IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
 docker_images_require \
-	"osmo-sgsn-$IMAGE_SUFFIX" \
 	"osmo-gbproxy-$IMAGE_SUFFIX" \
 	"ttcn3-gbproxy-test"
 
diff --git a/ttcn3-gbproxy-test/jenkins.sh b/ttcn3-gbproxy-test/jenkins.sh
index 2120f90..9605608 100755
--- a/ttcn3-gbproxy-test/jenkins.sh
+++ b/ttcn3-gbproxy-test/jenkins.sh
@@ -3,7 +3,7 @@
 . ../jenkins-common.sh
 IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
 docker_images_require \
-	"osmo-sgsn-$IMAGE_SUFFIX" \
+	"osmo-gbproxy-$IMAGE_SUFFIX" \
 	"ttcn3-gbproxy-test"
 
 SUBNET=24
@@ -32,7 +32,7 @@ docker run	--rm \
 		-v $VOL_BASE_DIR/gbproxy:/data \
 		--name ${BUILD_TAG}-gbproxy -d \
 		$DOCKER_ARGS \
-		$REPO_USER/osmo-sgsn-$IMAGE_SUFFIX \
+		$REPO_USER/osmo-gbproxy-$IMAGE_SUFFIX \
 		/bin/sh -c "osmo-gbproxy -c /data/osmo-gbproxy.cfg >/data/osmo-gbproxy.log 2>&1"
 
 echo Starting container with gbproxy testsuite