summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorentin LABBE <clabbe@baylibre.com>2019-06-26 15:27:38 +0200
committerCorentin LABBE <clabbe@baylibre.com>2019-06-26 15:27:38 +0200
commitd791251fbc4a739f4479a358544d434540c0b02a (patch)
treebbe706a7ad9df904529415efb2052bd2e1396f14
parent2c7d975039c64a4daa6c57cfd7aedfd93286e3bd (diff)
Permit to modify apache2 configuration
This patch permits to copy configurations files in lava-master/apache2/, there will be copied over in the /etc/apache2 directory of master.
-rw-r--r--lava-master/Dockerfile2
-rw-r--r--lava-master/apache2/.empty0
2 files changed, 2 insertions, 0 deletions
diff --git a/lava-master/Dockerfile b/lava-master/Dockerfile
index 7a70b58..80da8fb 100644
--- a/lava-master/Dockerfile
+++ b/lava-master/Dockerfile
@@ -34,6 +34,8 @@ COPY lava_http_fqdn /root/
COPY env/ /etc/lava-server/dispatcher.d/
+COPY apache2/ /etc/apache2/
+
EXPOSE 3079 5555 5556
CMD /start.sh && while [ true ];do sleep 365d; done
diff --git a/lava-master/apache2/.empty b/lava-master/apache2/.empty
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/lava-master/apache2/.empty