projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
16267: implement review feedback.
[arvados.git]
/
tools
/
arvbox
/
lib
/
arvbox
/
docker
/
Dockerfile.dev
diff --git
a/tools/arvbox/lib/arvbox/docker/Dockerfile.dev
b/tools/arvbox/lib/arvbox/docker/Dockerfile.dev
index e68642fecd5a2f0ff343eb869d569a43b945cd6a..e9c296a190453e43f3093d4f3aa392be01ee1783 100644
(file)
--- a/
tools/arvbox/lib/arvbox/docker/Dockerfile.dev
+++ b/
tools/arvbox/lib/arvbox/docker/Dockerfile.dev
@@
-1,16
+1,17
@@
-FROM arvados/arvbox-base
-
-RUN apt-get update && \
- DEBIAN_FRONTEND=noninteractive apt-get -yq --no-install-recommends install \
- linkchecker python3-virtualenv python-virtualenv xvfb iceweasel
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
-RUN set -e && \
- PJS=phantomjs-1.9.7-linux-x86_64 && \
- curl -L -o/tmp/$PJS.tar.bz2 http://cache.arvados.org/$PJS.tar.bz2 && \
- tar -C /usr/local -xjf /tmp/$PJS.tar.bz2 && \
- ln -s ../$PJS/bin/phantomjs /usr/local/bin/
+FROM arvados/arvbox-base
+ARG arvados_version
ADD service/ /var/lib/arvbox/service
ADD service/ /var/lib/arvbox/service
-RUN rmdir /etc/service && ln -sf /var/lib/arvbox/service /etc
+RUN ln -sf /var/lib/arvbox/service /etc
+RUN mkdir -p $ARVADOS_CONTAINER_PATH
+RUN echo "development" > $ARVADOS_CONTAINER_PATH/api_rails_env
+RUN echo "development" > $ARVADOS_CONTAINER_PATH/workbench_rails_env
-RUN mkdir /etc/test-service && ln -sf /var/lib/arvbox/service/postgres /etc/test-service
+RUN mkdir /etc/test-service && \
+ ln -sf /var/lib/arvbox/service/postgres /etc/test-service && \
+ ln -sf /var/lib/arvbox/service/certificate /etc/test-service
+RUN mkdir /etc/devenv-service