projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 8876-work-unit
[arvados.git]
/
docker
/
workbench
/
Dockerfile
diff --git
a/docker/workbench/Dockerfile
b/docker/workbench/Dockerfile
index 689f6561695116982253314d6dfc5f5749240d13..148153add20adc8b27138b67cb2f73a65e94867d 100644
(file)
--- a/
docker/workbench/Dockerfile
+++ b/
docker/workbench/Dockerfile
@@
-4,7
+4,8
@@
FROM arvados/passenger
MAINTAINER Ward Vandewege <ward@curoverse.com>
# We need graphviz for the provenance graphs
MAINTAINER Ward Vandewege <ward@curoverse.com>
# We need graphviz for the provenance graphs
-RUN apt-get update && apt-get -qqy install graphviz
+RUN apt-get update -q
+RUN apt-get install -qy graphviz
# Update Arvados source
RUN /bin/mkdir -p /usr/src/arvados/apps
# Update Arvados source
RUN /bin/mkdir -p /usr/src/arvados/apps
@@
-27,10
+28,10
@@
ADD generated/apache2_vhost /etc/apache2/sites-available/workbench
RUN \
a2dissite default && \
a2ensite workbench && \
RUN \
a2dissite default && \
a2ensite workbench && \
- a2enmod rewrite
+ a2enmod rewrite && \
+ /bin/mkdir /var/run/apache2
ADD apache2_foreground.sh /etc/apache2/foreground.sh
# Start Apache
CMD ["/etc/apache2/foreground.sh"]
ADD apache2_foreground.sh /etc/apache2/foreground.sh
# Start Apache
CMD ["/etc/apache2/foreground.sh"]
-