From 6d6487864171560a9943a6c36453cb0124cf5ae7 Mon Sep 17 00:00:00 2001
From: Alexander Lutay <alutay@sipwise.com>
Date: Thu, 27 Jun 2019 17:46:08 +0200
Subject: [PATCH] TT#60950 Switch ngcp-csc-ui docker to buster

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

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

diff --git a/t/Dockerfile b/t/Dockerfile
index 5ca00599..6ecff053 100644
--- a/t/Dockerfile
+++ b/t/Dockerfile
@@ -1,11 +1,11 @@
-# DOCKER_NAME=ngcp-csc-ui-stretch
-FROM docker.mgm.sipwise.com/sipwise-stretch:latest
+# DOCKER_NAME=ngcp-csc-ui-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-06-27
+ENV REFRESHED_AT 2019-06-27
 ENV DEBIAN_FRONTEND noninteractive
 ENV DISPLAY=:0
 
@@ -19,6 +19,7 @@ RUN apt-get update && apt-get install --assume-yes \
     gtk2-engines-pixbuf \
     libgconf-2-4 \
     net-tools \
+    npm \
     nodejs \
     wget \
     xterm \
@@ -47,16 +48,16 @@ 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="ngcp-csc-ui-stretch" -f ./t/Dockerfile .
-# % docker run --rm -i -t -v $(pwd):/code:ro ngcp-csc-ui-stretch:latest bash
+# % docker build --tag="ngcp-csc-ui-buster" -f ./t/Dockerfile .
+# % docker run --rm -i -t -v $(pwd):/code:ro ngcp-csc-ui-buster:latest bash
 #
 # Use the existing docker image:
-# % docker pull docker.mgm.sipwise.com/ngcp-csc-ui-stretch
+# % docker pull docker.mgm.sipwise.com/ngcp-csc-ui-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/ngcp-csc-ui-stretch:latest bash
+# % docker run --rm -i -t -v $(pwd):/code:ro -v /results docker.mgm.sipwise.com/ngcp-csc-ui-buster:latest bash
 #
 # Inside docker:
 #   cd /code && ./t/testrunner