From cfd6344f304f3e1fec034def42fddbde6f1333b1 Mon Sep 17 00:00:00 2001
From: Ward Vandewege <ward@curii.com>
Date: Mon, 12 Jul 2021 12:57:17 -0400
Subject: [PATCH] Bump Arvados to 2.2.0. Bump the rails-runtime image to Ubuntu
 20.04 (Focal Fossa) because the upstream changed. Fix a WebDAV configuration
 bug that manifested as workbench2 not being able to show the contents of a
 collection. Remove a deprecated config file entry.

No issue #

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>
---
 charts/arvados/config/config.yml     |  6 ++---
 charts/arvados/values.yaml           | 40 ++++++++++++++--------------
 dockerfiles/Dockerfile.rails-runtime |  2 +-
 dockerfiles/Makefile                 | 12 ++++++---
 4 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/charts/arvados/config/config.yml b/charts/arvados/config/config.yml
index 305df3d..76bc0de 100644
--- a/charts/arvados/config/config.yml
+++ b/charts/arvados/config/config.yml
@@ -6,8 +6,6 @@ Clusters:
   {{ .Values.uuidPrefix }}:
     SystemRootToken: wifieSh9voog8Bae0ahgeG5aechee4Ahloo0Aiw8Aeg4Eiceiy6ku9Eghipha6an
     ManagementToken: IeR3ahch3aehu1ahbiVoogio4jaeshashae5ienil2le2eequa6Ootho9yee2xua
-    API:
-      RailsSessionSecretToken: changeme
     Workbench:
       SecretKeyBase: ooTho2Ek8ainiegiong7eiGh2te2roP6aevaigheerizahquee2shahziengoh3y
     Collections:
@@ -84,9 +82,11 @@ Clusters:
           http://arvados-keep-store-0.arvados-keep-store:25107: {}
           http://arvados-keep-store-1.arvados-keep-store:25107: {}
       WebDAV:
-        ExternalURL: https://{{ .Values.externalIP }}:9002
+        ExternalURL: https://{{ .Values.externalIP }}:9002/
         InternalURLs:
           "http://localhost:29002": {}
+      WebDAVDownload:
+        ExternalURL: https://{{ .Values.externalIP }}:9002
       Websocket:
         ExternalURL: wss://{{ .Values.externalIP }}:9003/websocket
         InternalURLs:
diff --git a/charts/arvados/values.yaml b/charts/arvados/values.yaml
index cf19636..3b1fbd4 100644
--- a/charts/arvados/values.yaml
+++ b/charts/arvados/values.yaml
@@ -55,27 +55,27 @@ uuidPrefix: vwxyz
 arvados:
   versions:
     distribution:
-      arvadosApiServer: 2.1.1-1
-      arvadosController: 2.1.1-1
-      arvadosGitHttpd: 2.1.1-1
-      arvadosHealth: 2.1.1-1
-      arvadosWorkbench: 2.1.1-1
-      arvadosWorkbench2: 2.1.1-1
-      arvadosWs: 2.1.1-1
-      crunchDispatchSlurm: 2.1.1-1
-      crunchRun: 2.1.1-1
-      crunchRunner: 2.1.1-1
-      keepBalance: 2.1.1-1
-      keepStore: 2.1.1-1
-      keepWeb: 2.1.1-1
-      keepProxy: 2.1.1-1
-      libPamArvados: 2.1.1-1
-      pythonArvadosFuse: 2.1.1-1
-      pythonArvadosPythonClient: 2.1.1-1
+      arvadosApiServer: 2.2.0-1
+      arvadosController: 2.2.0-1
+      arvadosGitHttpd: 2.2.0-1
+      arvadosHealth: 2.2.0-1
+      arvadosWorkbench: 2.2.0-1
+      arvadosWorkbench2: 2.2.0-1
+      arvadosWs: 2.2.0-1
+      crunchDispatchSlurm: 2.2.0-1
+      crunchRun: 2.2.0-1
+      crunchRunner: 2.2.0-1
+      keepBalance: 2.2.0-1
+      keepStore: 2.2.0-1
+      keepWeb: 2.2.0-1
+      keepProxy: 2.2.0-1
+      libPamArvados: 2.2.0-1
+      pythonArvadosFuse: 2.2.0-1
+      pythonArvadosPythonClient: 2.2.0-1
     gem:
-      arvados: 2.1.1
-      arvadosCLI: 2.1.1
-      arvadosLoginSync: 2.1.1
+      arvados: 2.2.0
+      arvadosCLI: 2.2.0
+      arvadosLoginSync: 2.2.0
 
 postgres:
   persistence:
diff --git a/dockerfiles/Dockerfile.rails-runtime b/dockerfiles/Dockerfile.rails-runtime
index 3184455..3d6baea 100644
--- a/dockerfiles/Dockerfile.rails-runtime
+++ b/dockerfiles/Dockerfile.rails-runtime
@@ -13,7 +13,7 @@ RUN sed -i 's/daemon off;/#daemon off;/' /etc/nginx/nginx.conf
 ADD 1078ECD7.asc /tmp/
 RUN cat /tmp/1078ECD7.asc | apt-key add -
 
-RUN echo "deb http://apt.arvados.org/bionic bionic main" > /etc/apt/sources.list.d/apt.arvados.org.list
+RUN echo "deb http://apt.arvados.org/focal focal main" > /etc/apt/sources.list.d/apt.arvados.org.list
 
 RUN apt-get update && apt-get install -qqy tzdata
 
diff --git a/dockerfiles/Makefile b/dockerfiles/Makefile
index 0870f6e..cd24b4b 100644
--- a/dockerfiles/Makefile
+++ b/dockerfiles/Makefile
@@ -3,33 +3,37 @@
 # SPDX-License-Identifier: AGPL-3.0
 
 REPO = cure
+REBUILD=
 
 all: build push
 
+rebuild: REBUILD="--no-cache"
+rebuild: build
+
 build: docker-build-arvados-runtime docker-build-arvados-rails-runtime docker-build-arvados-slurm-runtime docker-build-arvados-shell-server-runtime
 
 push: docker-push-arvados-runtime docker-push-arvados-rails-runtime docker-push-arvados-slurm-runtime docker-push-arvados-shell-server-runtime
 
 docker-build-arvados-runtime:
-	docker build -t ${REPO}/arvados-runtime -f Dockerfile.runtime .
+	docker build ${REBUILD} -t ${REPO}/arvados-runtime -f Dockerfile.runtime .
 
 docker-push-arvados-runtime: docker-build-arvados-runtime
 	docker push ${REPO}/arvados-runtime:latest
 
 docker-build-arvados-rails-runtime:
-	docker build -t ${REPO}/arvados-rails-runtime -f Dockerfile.rails-runtime .
+	docker build ${REBUILD} -t ${REPO}/arvados-rails-runtime -f Dockerfile.rails-runtime .
 
 docker-push-arvados-rails-runtime: docker-build-arvados-rails-runtime
 	docker push ${REPO}/arvados-rails-runtime:latest
 
 docker-build-arvados-slurm-runtime:
-	docker build -t ${REPO}/arvados-slurm-runtime -f Dockerfile.slurm-runtime .
+	docker build ${REBUILD} -t ${REPO}/arvados-slurm-runtime -f Dockerfile.slurm-runtime .
 
 docker-push-arvados-slurm-runtime: docker-build-arvados-slurm-runtime
 	docker push ${REPO}/arvados-slurm-runtime:latest
 
 docker-build-arvados-shell-server-runtime:
-	docker build -t ${REPO}/arvados-shell-server-runtime -f Dockerfile.shell_server-runtime .
+	docker build ${REBUILD} -t ${REPO}/arvados-shell-server-runtime -f Dockerfile.shell_server-runtime .
 
 docker-push-arvados-shell-server-runtime: docker-build-arvados-shell-server-runtime
 	docker push ${REPO}/arvados-shell-server-runtime:latest
-- 
2.30.2