From 8c78269cd60290e8b66410efc3db7fd6f708c4b4 Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Fri, 10 Apr 2020 11:00:51 -0700
Subject: [PATCH] Dockerfile: use bats-core

The bats testing framework we use for integration test is not maintained
since 2015 and was superceded by bats-core [1]. Unfortunately, Debian
still packages very old version of bats from the old repo.

Use recent bats-core as installed by npm, as recommended in [3].

[1] https://github.com/sstephenson/bats/pull/269
[3] https://github.com/bats-core/bats-core/wiki/Install-Bats-Using-a-Package

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 Dockerfile | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 94be151e8b1..1197ef4af58 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,4 @@
 ARG GO_VERSION=1.13
-ARG BATS_VERSION=03608115df2071fff4eaaff1605768c275e5f81f
 ARG CRIU_VERSION=v3.13
 
 FROM golang:${GO_VERSION}-buster
@@ -33,6 +32,7 @@ RUN dpkg --add-architecture armel \
         libseccomp-dev:armhf \
         libseccomp-dev:ppc64el \
         libseccomp2 \
+        npm \
         pkg-config \
         protobuf-c-compiler \
         protobuf-compiler \
@@ -49,13 +49,7 @@ RUN dpkg --add-architecture armel \
 RUN useradd -u1000 -m -d/home/rootless -s/bin/bash rootless
 
 # install bats
-ARG BATS_VERSION
-RUN cd /tmp \
-    && git clone https://github.com/sstephenson/bats.git \
-    && cd bats \
-    && git reset --hard "${BATS_VERSION}" \
-    && ./install.sh /usr/local \
-    && rm -rf /tmp/bats
+RUN npm install -g bats
 
 # install criu
 ARG CRIU_VERSION