17782: Makes "arvados-server install" a dependency of all tests.

We need to make sure the correct nodejs version is installed before attempting
to run "yarn install".

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima@curii.com>

diff --git a/Makefile b/Makefile
index 1e923710cd19ce89cedbe0edd3b0eff6b317232f..3df3c78ce1f9e9c7f8708fad65e9ffbc081511b0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -59,7 +59,15 @@ clean-node-modules:
 
 clean: clean-rpm clean-deb clean-node-modules
 
-yarn-install:
+arvados-server-install:
+       cd $(ARVADOS_DIRECTORY)
+       go mod download
+       cd cmd/arvados-server
+       go install
+       cd -
+       ~/go/bin/arvados-server install -type test
+
+yarn-install: arvados-server-install
        yarn install
 
 unit-tests: yarn-install

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 3d6aad706f59f8dbd95204f52ce09f66796624be..390e1efa628753e4fc0a4758b6a42dcb509d4529 100644 (file)
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: AGPL-3.0
 
-FROM node:12.22.1-buster
+FROM debian:buster
 LABEL maintainer="Arvados Package Maintainers <packaging@arvados.org>"
 
 RUN echo deb http://deb.debian.org/debian buster-backports main >> /etc/apt/sources.list.d/backports.list