From 7cfa94ee9cbc6fa730da76b26bd33d8f68a1f99a Mon Sep 17 00:00:00 2001
From: Alexander Lutay <alutay@sipwise.com>
Date: Thu, 27 Jun 2019 17:37:24 +0200
Subject: [PATCH] TT#60950 Switch janus-client docker to buster

The package npm is separate package now, install it directly.

Change-Id: I5ae7bc26dfed805ffe42eeb1b53ec9ab308322a0
---
 t/Dockerfile | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/t/Dockerfile b/t/Dockerfile
index 6363792..cbe37c6 100644
--- a/t/Dockerfile
+++ b/t/Dockerfile
@@ -1,11 +1,11 @@
-# DOCKER_NAME=janus-client-stretch
-FROM docker.mgm.sipwise.com/sipwise-stretch:latest
+# DOCKER_NAME=janus-client-buster
+FROM docker.mgm.sipwise.com/sipwise-buster: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 2018-12-12
+ENV REFRESHED_AT 2019-06-27
 
 # files that get-code generates
 COPY t/sources.list.d/builddeps.list /etc/apt/sources.list.d/
@@ -13,6 +13,7 @@ COPY t/sources.list.d/preferences /etc/apt/preferences.d/
 
 RUN apt-get update && apt-get install --assume-yes \
         curl \
+        npm \
         nodejs
 
 RUN echo "cd /code && ./t/testrunner" >/root/.bash_history
@@ -34,17 +35,17 @@ 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-stretch main" > t/sources.list.d/builddeps.list
+# echo "deb https://deb.sipwise.com/autobuild/ release-trunk-buster main" > t/sources.list.d/builddeps.list
 #
 # NOTE: run the following command from root folder of git repository:
-# % docker build --tag="janus-client-stretch" -f ./t/Dockerfile .
+# % docker build --tag="janus-client-buster" -f ./t/Dockerfile .
 # NOTE: run the following command from root folder of git repository:
-# % docker run --rm -i -t -v $(pwd):/code:ro -v /results janus-client-stretch:latest bash
+# % docker run --rm -i -t -v $(pwd):/code:ro -v /results janus-client-buster:latest bash
 #
 # Use the existing docker image:
-# % docker pull docker.mgm.sipwise.com/janus-client-stretch
+# % docker pull docker.mgm.sipwise.com/janus-client-buster
 # NOTE: run the following command from root folder of git repository:
-# % docker run --rm -i -t -v $(pwd):/code:ro -v /results docker.mgm.sipwise.com/janus-client-stretch:latest bash
+# % docker run --rm -i -t -v $(pwd):/code:ro -v /results docker.mgm.sipwise.com/janus-client-buster:latest bash
 #
 # Inside docker:
 #   cd /code && ./t/testrunner