whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [whimsy] branch master updated: Move httpd setup to end as it is changeable and quick
Date Mon, 09 Dec 2019 15:51:14 GMT
This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
     new 6723a7a  Move httpd setup to end as it is changeable and quick
6723a7a is described below

commit 6723a7af4a4e395dde5639d49b24fb1894b5e806
Author: Sebb <sebb@apache.org>
AuthorDate: Mon Dec 9 15:51:04 2019 +0000

    Move httpd setup to end as it is changeable and quick
---
 docker/Dockerfile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 535a87c..d256271 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -50,8 +50,6 @@ RUN apt-get update && \
     a2enmod proxy_wstunnel &&\
     echo "ServerName whimsy.local" > /etc/apache2/conf-enabled/servername.conf
 
-COPY work/whimsy.conf /etc/apache2/sites-enabled/000-default.conf
-
 RUN echo 'SetEnv GEM_HOME /srv/gems' > /etc/apache2/conf-enabled/gemhome.conf
 
 # Add new items at the end so previous layers can be re-used
@@ -62,6 +60,10 @@ RUN DEBIAN_FRONTEND='noninteractive' apt-get install -y vim
 # for checking ldap settings etc
 RUN DEBIAN_FRONTEND='noninteractive' apt-get install -y ldap-utils
 
+# This should be last, as the source is likely to change
+# It also takes very little time, so it does not matter if it has to be redone
+COPY work/whimsy.conf /etc/apache2/sites-enabled/000-default.conf
+
 WORKDIR /srv/whimsy
 EXPOSE 80
 


Mime
View raw message