1 files changed, 10 insertions, 7 deletions
diff --git a/Services/apache/Dockerfile b/Services/apache/Dockerfile
index 69c12ad..316834c 100644
--- a/Services/apache/Dockerfile
+++ b/Services/apache/Dockerfile
@@ -1,16 +1,19 @@
 FROM startx/fedora
 MAINTAINER Christophe LARUE <dev@startx.fr>
 
-COPY apache_run.sh /bin/
+# Install packages and set up httpd
 RUN yum -y install httpd \
     && yum clean all \
     && mkdir -p /var/www/html \
-    && mkdir -p /var/log/httpd \
-    && chmod ug+rx /bin/apache_*
-COPY welcome.html /var/www/html/index.html
+    && mkdir -p /var/log/httpd 
+# Copy startx toolkit
+COPY sx/* /sx/
+# Copy html content
+COPY html/* /var/www/html/
+RUN chmod ug+rx /sx/httpd* \
+    && chmod ug+r /var/www/html/*\
+    && chmod ug+r /var/www/html/*
 
 EXPOSE 80
 EXPOSE 443
-
-CMD ["/bin/apache_run.sh"]
-ONBUILD CMD ["/bin/apache_run.sh"]
-\ No newline at end of file
+CMD ["/sx/httpd_run.sh"]
+\ No newline at end of file