X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/7c7b9ab80e1b33a108c55a23b3dfe793a73ecc95..43da0e7ce859cb8ed3385417a2fc97a36cc688e6:/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 c459260ace..ed728204fa 100644 --- a/tools/arvbox/lib/arvbox/docker/Dockerfile.demo +++ b/tools/arvbox/lib/arvbox/docker/Dockerfile.demo @@ -4,21 +4,17 @@ FROM arvados/arvbox-base ARG arvados_version -ARG sso_version=master ARG composer_version=arvados-fork ARG workbench2_version=master RUN cd /usr/src && \ - git clone --no-checkout https://github.com/arvados/arvados.git && \ + git clone --no-checkout https://git.arvados.org/arvados.git && \ git -C arvados checkout ${arvados_version} && \ 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 -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 clone --no-checkout https://git.arvados.org/arvados-workbench2.git workbench2 && \ git -C workbench2 checkout ${workbench2_version} && \ git -C workbench2 pull && \ chown -R 1000:1000 /usr/src @@ -27,7 +23,6 @@ ADD service/ /var/lib/arvbox/service RUN ln -sf /var/lib/arvbox/service /etc RUN mkdir -p /var/lib/arvados RUN echo "production" > /var/lib/arvados/api_rails_env -RUN echo "production" > /var/lib/arvados/sso_rails_env RUN echo "production" > /var/lib/arvados/workbench_rails_env RUN /usr/local/lib/arvbox/createusers.sh @@ -36,13 +31,12 @@ RUN sudo -u arvbox /var/lib/arvbox/service/api/run-service --only-deps 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/workbench/run-service --only-deps RUN sudo -u arvbox /var/lib/arvbox/service/doc/run-service --only-deps RUN sudo -u arvbox /var/lib/arvbox/service/vm/run-service --only-deps RUN sudo -u arvbox /var/lib/arvbox/service/keepproxy/run-service --only-deps RUN sudo -u arvbox /var/lib/arvbox/service/arv-git-httpd/run-service --only-deps RUN sudo -u arvbox /var/lib/arvbox/service/crunch-dispatch-local/run-service --only-deps -RUN sudo -u arvbox /var/lib/arvbox/service/websockets/run-service --only-deps +RUN sudo -u arvbox /var/lib/arvbox/service/websockets/run --only-deps RUN sudo -u arvbox /usr/local/lib/arvbox/keep-setup.sh --only-deps RUN sudo -u arvbox /var/lib/arvbox/service/sdk/run-service