From 43fff13af5aa7a07e6fe942e010bed62bd95bc08 Mon Sep 17 00:00:00 2001 From: Lucas Di Pentima Date: Wed, 7 Jul 2021 16:30:50 -0300 Subject: [PATCH] 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 --- Makefile | 10 +++++++++- docker/Dockerfile | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 1e923710cd..3df3c78ce1 100644 --- 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 3d6aad706f..390e1efa62 100644 --- 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 " RUN echo deb http://deb.debian.org/debian buster-backports main >> /etc/apt/sources.list.d/backports.list -- 2.30.2