From cf2f0f09fa52621245b825619e00ff02dc009de6 Mon Sep 17 00:00:00 2001
From: Jocelyn Fiat <git@djoce.net>
Date: Tue, 24 Apr 2018 15:13:47 +0200
Subject: [PATCH] Updated container files.

---
 examples/docker/Dockerfile                     | 18 ++++++++++--------
 examples/docker/README.md                      |  2 +-
 .../{build_debug_fcgi => build_service_fcgi}   |  2 +-
 examples/docker/files/html/.htaccess           |  2 +-
 4 files changed, 13 insertions(+), 11 deletions(-)
 rename examples/docker/files/{build_debug_fcgi => build_service_fcgi} (93%)

diff --git a/examples/docker/Dockerfile b/examples/docker/Dockerfile
index 264ca91c..8b475823 100644
--- a/examples/docker/Dockerfile
+++ b/examples/docker/Dockerfile
@@ -3,12 +3,14 @@ FROM debian
 MAINTAINER Jocelyn Fiat <jfiat@eiffel.com>
 LABEL description="EiffelWeb debug example hosted using apache2+libfcgi"
 
-RUN apt-get update \
-        && apt-get -y install curl bzip2 make gcc \
-        && apt-get -y install apache2 libapache2-mod-fcgid libfcgi-dev \
-        && apt-get -y install tmux git-all vim \
+RUN apt-get update 										\
+        && apt-get -y install --no-install-recommends 	\
+			curl bzip2 make gcc git-core 				\
+			apache2 libapache2-mod-fcgid libfcgi-dev 	\
         && rm -rf /var/lib/apt/lists/*
 
+#RUN apt-get update && apt-get -y install tmux git-all vim && rm -rf /var/lib/apt/lists/*
+
 EXPOSE 80
 
 RUN a2enmod rewrite suexec include fcgid
@@ -28,18 +30,18 @@ WORKDIR $HOME
 RUN mkdir $WEBDIR
 
 #Build the debug EiffelWeb example and copy the executable to $HOME/
-COPY files/build_debug_fcgi $HOME/build_debug_fcgi
+COPY files/build_service_fcgi $HOME/build_service_fcgi
 USER root
-RUN chown eifweb:eifweb $HOME/build_debug_fcgi && chmod 700 $HOME/build_debug_fcgi
+RUN chown eifweb:eifweb $HOME/build_service_fcgi && chmod 700 $HOME/build_service_fcgi
 USER eifweb
-RUN $HOME/build_debug_fcgi $HOME/www
+RUN $HOME/build_service_fcgi $HOME/www
 
 USER root
 COPY ./files/httpd.conf /etc/apache2/sites-enabled/000-default.conf
 COPY ./files/html/.htaccess $WEBDIR/html/.htaccess
 COPY ./files/html/index.html $WEBDIR/html/index.html
 RUN echo > $WEBDIR/html/service.ews
-RUN chown www-data:www-data -R $WEBDIR && chmod 400 $WEBDIR/html/*
+RUN chown www-data:www-data -R $WEBDIR 
 
 #Setup apache as foreground (for docker purpose)
 RUN mkdir /etc/service/apache
diff --git a/examples/docker/README.md b/examples/docker/README.md
index c83bdd0c..7dd64095 100644
--- a/examples/docker/README.md
+++ b/examples/docker/README.md
@@ -12,7 +12,7 @@ To build the docker image:
 
 To run the docker image in a self-destroyed container:
 ```
-	docker run --rm -it -p 8080:80 --name my-ewf-debug local/ewf-debug-httpd
+	docker run --rm -dit -p 8080:80 --name my-ewf-debug local/ewf-debug-httpd
 ```
 
 Notes:
diff --git a/examples/docker/files/build_debug_fcgi b/examples/docker/files/build_service_fcgi
similarity index 93%
rename from examples/docker/files/build_debug_fcgi
rename to examples/docker/files/build_service_fcgi
index bfbca07f..197fdf61 100644
--- a/examples/docker/files/build_debug_fcgi
+++ b/examples/docker/files/build_service_fcgi
@@ -16,7 +16,7 @@ source $HOME/eiffel.rc
 git clone https://github.com/EiffelWebFramework/EWF.git $web_dir/src
 
 # Build executable
-eiffel build -v --target debug_libfcgi $web_dir/src/examples/debug/debug.ecf $web_dir/bin/debug.fcgi
+eiffel build -v --target debug_libfcgi $web_dir/src/examples/debug/debug.ecf $web_dir/html/debug.fcgi
 
 # Clean files
 rm -rf $ISE_EIFFEL
diff --git a/examples/docker/files/html/.htaccess b/examples/docker/files/html/.htaccess
index 18cbfcac..84ca5e37 100644
--- a/examples/docker/files/html/.htaccess
+++ b/examples/docker/files/html/.htaccess
@@ -1,6 +1,6 @@
 <IfModule mod_fcgid.c>
 AddHandler fcgid-script .ews
-FcgidWrapper /home/eifweb/www/bin/debug.fcgi .ews
+FcgidWrapper /home/eifweb/www/html/service.fcgi .ews
 </IfModule>
 
 Options +ExecCGI +Includes +FollowSymLinks