From 606362f1e85663b603771b23663f09972f886fc5 Mon Sep 17 00:00:00 2001
From: Alexander Lutay <alutay@sipwise.com>
Date: Fri, 22 Sep 2017 18:12:45 +0200
Subject: [PATCH] TT#21905 Switch lua-ngcp-kamailio Dockerfile to Debian
 stretch

+ TT#22410 Fix typo in Dockerfile 'Instructions for usage'

In jessie based docker we used lua-unit 3.0-1 while in stretch it is
3.2-1. Newer lua-unit doesn't have setFname and setVerbosity functions.
Instead of setFname we can use --name parameter. setVerbosity(1) is set
by default so we can simply omit it.

Change-Id: Icd01c7b997d8b8567ab43d2bd1220d1824024287
---
 run_tests.sh |  5 +----
 t/Dockerfile | 17 ++++++++---------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/run_tests.sh b/run_tests.sh
index 530661b..cd51ff0 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -36,18 +36,15 @@ require "tests/${1}"
 ---- Control test output:
 local lu = LuaUnit
 lu:setOutputType('${FORMAT}')
-lu:setVerbosity(1)
 lu:run()
 EOF
 	else
-		cat<<EOF |lua5.1 -
+		cat<<EOF |lua5.1 - --name "${RES}"
 EXPORT_ASSERT_TO_GLOBALS = true
 require "tests/${1}"
 ---- Control test output:
 local lu = LuaUnit
 lu:setOutputType('${FORMAT}')
-lu:setFname('${RES}')
-lu:setVerbosity(1)
 lu:run()
 EOF
 		if [[ "${FORMAT}" = "JUNIT" ]] ; then
diff --git a/t/Dockerfile b/t/Dockerfile
index d0767a0..0cb449e 100644
--- a/t/Dockerfile
+++ b/t/Dockerfile
@@ -1,11 +1,11 @@
-# DOCKER_NAME=lua-ngcp-kamailio-jessie
-FROM docker.mgm.sipwise.com/sipwise-jessie:latest
+# DOCKER_NAME=lua-ngcp-kamailio-stretch
+FROM docker.mgm.sipwise.com/sipwise-stretch:latest
 
 # Important! Update this no-op ENV variable when this Dockerfile
 # is updated with the current date. It will force refresh of all
 # of the base images and things like `apt-get update` won't be using
 # old cached versions when the Dockerfile is built.
-ENV REFRESHED_AT 2017-06-30
+ENV REFRESHED_AT 2017-09-25
 
 # files that get-code generates
 COPY t/sources.list.d/builddeps.list /etc/apt/sources.list.d/
@@ -26,16 +26,15 @@ WORKDIR /code/
 #
 # you need to put the proper NGCP sources at t/sources.list.d/builddeps.list
 # for instance, trunk:
-# echo "deb https://deb.sipwise.com/autobuild/ release-trunk-jessie main" > /
-#  t/sources.list.d/builddeps.list
+# echo "deb https://deb.sipwise.com/autobuild/ release-trunk-stretch main" > t/sources.list.d/builddeps.list
 #
-# % docker build --tag="lua-ngcp-kamailio-jessie" -f t/Dockerfile .
-# % docker run --rm -i -t -v $(pwd):/code:rw lua-ngcp-kamailio-jessie:latest bash
+# % docker build --tag="lua-ngcp-kamailio-stretch" -f t/Dockerfile .
+# % docker run --rm -i -t -v $(pwd):/code:rw lua-ngcp-kamailio-stretch:latest bash
 #
 # Use the existing docker image:
-# % docker pull docker.mgm.sipwise.com/lua-ngcp-kamailio-jessie
+# % docker pull docker.mgm.sipwise.com/lua-ngcp-kamailio-stretch
 # NOTE: run the following command from root folder of git repository:
-# % docker run --rm -i -t -v $(pwd):/code:rw docker.mgm.sipwise.com/lua-ngcp-kamailio-jessie:latest bash
+# % docker run --rm -i -t -v $(pwd):/code:rw docker.mgm.sipwise.com/lua-ngcp-kamailio-stretch:latest bash
 #
 # Inside docker (the command is in history, just press UP button):
 #   ./t/testrunner