From: Lucas Di Pentima <lucas@di-pentima.com.ar>
Date: Wed, 15 Apr 2020 20:24:37 +0000 (-0300)
Subject: 16029: Updates Dockerfile to build a seeded image with arvados boot deps.
X-Git-Tag: 2.1.0~32^2~5
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/9bd1a28a2f55eb435ff808cc118fe4f0b7f94c51

16029: Updates Dockerfile to build a seeded image with arvados boot deps.

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas@di-pentima.com.ar>
---

diff --git a/Dockerfile b/Dockerfile
index 6f4fe7e1..a6abbbd3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,14 @@
 
 FROM node:8-buster
 MAINTAINER Ward Vandewege <ward@curoverse.com>
-RUN apt-get update
-RUN apt-get -q -y install libsecret-1-0 libsecret-1-dev rpm
-RUN apt-get install -q -y ruby ruby-dev rubygems build-essential
+RUN apt-get update && \
+    apt-get -yq --no-install-recommends -o Acquire::Retries=6 install \
+    libsecret-1-0 libsecret-1-dev rpm ruby ruby-dev rubygems build-essential \
+    golang libpam0g-dev && \
+    apt-get clean
 RUN gem install --no-ri --no-rdoc fpm
+RUN git clone https://git.arvados.org/arvados.git && cd arvados && \
+    go mod download && \
+    go run ./cmd/arvados-server install -type test && cd .. && \
+    rm -rf arvados && \
+    apt-get clean
diff --git a/Makefile b/Makefile
index 0963b7c9..bb09fb2f 100644
--- a/Makefile
+++ b/Makefile
@@ -60,9 +60,15 @@ clean: clean-rpm clean-deb clean-node-modules
 yarn-install:
 	yarn install
 
-test: yarn-install
+unit-tests: yarn-install
 	yarn test --no-watchAll --bail --ci
 
+integration-tests: yarn-install
+	yarn run cypress install
+	$(WORKSPACE)/tools/run-integration-tests.sh
+
+test: unit-tests integration-tests
+
 build: test
 	VERSION=$(VERSION) yarn build
 
diff --git a/tools/run-integration-tests.sh b/tools/run-integration-tests.sh
index 399354cf..0b582e16 100755
--- a/tools/run-integration-tests.sh
+++ b/tools/run-integration-tests.sh
@@ -28,7 +28,7 @@ cd ${WORKDIR}
 go mod download || exit 1
 
 echo "Installing dev dependencies..."
-sudo go run ./cmd/arvados-server install -type test || exit 1
+go run ./cmd/arvados-server install -type test || exit 1
 
 echo "Running arvados in test mode..."
 ARVADOS_PORT=`random_free_port`