summaryrefslogtreecommitdiffstats
path: root/lava-master/Dockerfile
diff options
context:
space:
mode:
authorkhilman <khilman@users.noreply.github.com>2018-01-24 08:58:57 -0800
committerGitHub <noreply@github.com>2018-01-24 08:58:57 -0800
commitf14d69b382978069321acdec9a434ca85ac137da (patch)
tree90cdd4df15614ffe022778f986d551a63959712e /lava-master/Dockerfile
parent736fc3248108069d9f7d98fadc436aad3732dfab (diff)
parentc856c35e30f4465f8d14834d672a0dcbf06567fb (diff)
Merge pull request #13 from montjoie/bugfix
Bugfix
Diffstat (limited to 'lava-master/Dockerfile')
-rw-r--r--lava-master/Dockerfile5
1 files changed, 5 insertions, 0 deletions
diff --git a/lava-master/Dockerfile b/lava-master/Dockerfile
index 2dd44b0..be8a3b7 100644
--- a/lava-master/Dockerfile
+++ b/lava-master/Dockerfile
@@ -13,12 +13,14 @@ RUN echo 'lava-server lava-server/instance-name string lava-docker-instance' |
&& echo 'locales locales/locales_to_be_generated multiselect C.UTF-8 UTF-8, en_US.UTF-8 UTF-8 ' | debconf-set-selections \
&& echo 'locales locales/default_environment_locale select en_US.UTF-8' | debconf-set-selections
+# e2fsprogs is for libguestfs
RUN DEBIAN_FRONTEND=noninteractive apt-get -y install \
locales \
postgresql \
screen \
sudo \
wget \
+ e2fsprogs \
gnupg \
vim
@@ -78,6 +80,9 @@ RUN /start.sh && /setup.sh && /stop.sh
#uncomment if you want to use squid
#RUN sed -i 's,^.*http_proxy:.*, http_proxy: http://squid:3128,' /etc/lava-server/env.yaml
+#comment this if you do HTTPS (For reenabling CSRF cookie)
+COPY settings.conf /etc/lava-server/
+
EXPOSE 69/udp 80 3079 5555 5556
CMD /start.sh && bash