15924: Update github links to arvados org.

[arvados.git] / tools / arvbox / lib / arvbox / docker / Dockerfile.demo

diff --git a/tools/arvbox/lib/arvbox/docker/Dockerfile.demo b/tools/arvbox/lib/arvbox/docker/Dockerfile.demo
index 7cb51edfdc61ab6c9b67b29353eeb2f79e8774eb..9b1466a47c7dabb2c079fd5e20c338d5a9de3503 100644 (file)
--- a/tools/arvbox/lib/arvbox/docker/Dockerfile.demo
+++ b/tools/arvbox/lib/arvbox/docker/Dockerfile.demo
@@ -5,15 +5,22 @@
 FROM arvados/arvbox-base
 ARG arvados_version
 ARG sso_version=master
-ARG composer_version=master
+ARG composer_version=arvados-fork
+ARG workbench2_version=master
 
 RUN cd /usr/src && \
-    git clone --no-checkout https://github.com/curoverse/arvados.git && \
+    git clone --no-checkout https://github.com/arvados/arvados.git && \
     git -C arvados checkout ${arvados_version} && \
-    git clone --no-checkout https://github.com/curoverse/sso-devise-omniauth-provider.git sso && \
+    git -C arvados pull && \
+    git clone --no-checkout https://github.com/arvados/sso-devise-omniauth-provider.git sso && \
     git -C sso checkout ${sso_version} && \
-    git clone --no-checkout https://github.com/curoverse/composer.git && \
-    git -C composer checkout ${composer_version}
+    git -C sso pull && \
+    git clone --no-checkout https://github.com/arvados/composer.git && \
+    git -C composer checkout ${composer_version} && \
+    git -C composer pull && \
+    git clone --no-checkout https://github.com/arvados/arvados-workbench2.git workbench2 && \
+    git -C workbench2 checkout ${workbench2_version} && \
+    git -C workbench2 pull
 
 ADD service/ /var/lib/arvbox/service
 RUN ln -sf /var/lib/arvbox/service /etc
@@ -25,6 +32,7 @@ RUN echo "production" > /var/lib/arvados/workbench_rails_env
 RUN chown -R 1000:1000 /usr/src && /usr/local/lib/arvbox/createusers.sh
 
 RUN sudo -u arvbox /var/lib/arvbox/service/composer/run-service --only-deps
+RUN sudo -u arvbox /var/lib/arvbox/service/workbench2/run-service --only-deps
 RUN sudo -u arvbox /var/lib/arvbox/service/keep-web/run-service --only-deps
 RUN sudo -u arvbox /var/lib/arvbox/service/sso/run-service --only-deps
 RUN sudo -u arvbox /var/lib/arvbox/service/api/run-service --only-deps