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
changes/94/15594/5
Alexander Lutay 8 years ago committed by Sergii Kipot
parent f7b57ad0aa
commit 606362f1e8

@ -36,18 +36,15 @@ require "tests/${1}"
---- Control test output: ---- Control test output:
local lu = LuaUnit local lu = LuaUnit
lu:setOutputType('${FORMAT}') lu:setOutputType('${FORMAT}')
lu:setVerbosity(1)
lu:run() lu:run()
EOF EOF
else else
cat<<EOF |lua5.1 - cat<<EOF |lua5.1 - --name "${RES}"
EXPORT_ASSERT_TO_GLOBALS = true EXPORT_ASSERT_TO_GLOBALS = true
require "tests/${1}" require "tests/${1}"
---- Control test output: ---- Control test output:
local lu = LuaUnit local lu = LuaUnit
lu:setOutputType('${FORMAT}') lu:setOutputType('${FORMAT}')
lu:setFname('${RES}')
lu:setVerbosity(1)
lu:run() lu:run()
EOF EOF
if [[ "${FORMAT}" = "JUNIT" ]] ; then if [[ "${FORMAT}" = "JUNIT" ]] ; then

@ -1,11 +1,11 @@
# DOCKER_NAME=lua-ngcp-kamailio-jessie # DOCKER_NAME=lua-ngcp-kamailio-stretch
FROM docker.mgm.sipwise.com/sipwise-jessie:latest FROM docker.mgm.sipwise.com/sipwise-stretch:latest
# Important! Update this no-op ENV variable when this Dockerfile # Important! Update this no-op ENV variable when this Dockerfile
# is updated with the current date. It will force refresh of all # 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 # of the base images and things like `apt-get update` won't be using
# old cached versions when the Dockerfile is built. # 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 # files that get-code generates
COPY t/sources.list.d/builddeps.list /etc/apt/sources.list.d/ 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 # you need to put the proper NGCP sources at t/sources.list.d/builddeps.list
# for instance, trunk: # for instance, trunk:
# echo "deb https://deb.sipwise.com/autobuild/ release-trunk-jessie main" > / # echo "deb https://deb.sipwise.com/autobuild/ release-trunk-stretch main" > t/sources.list.d/builddeps.list
# t/sources.list.d/builddeps.list
# #
# % docker build --tag="lua-ngcp-kamailio-jessie" -f t/Dockerfile . # % docker build --tag="lua-ngcp-kamailio-stretch" -f t/Dockerfile .
# % docker run --rm -i -t -v $(pwd):/code:rw lua-ngcp-kamailio-jessie:latest bash # % docker run --rm -i -t -v $(pwd):/code:rw lua-ngcp-kamailio-stretch:latest bash
# #
# Use the existing docker image: # 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: # 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): # Inside docker (the command is in history, just press UP button):
# ./t/testrunner # ./t/testrunner

Loading…
Cancel
Save