summaryrefslogtreecommitdiffstats
path: root/Services/apache/Dockerfile
diff options
context:
space:
mode:
authorstartxfr <clarue@startx.fr>2014-12-05 22:33:01 +0100
committerstartxfr <clarue@startx.fr>2014-12-05 22:33:01 +0100
commit28d5ddd7f63e587d48a985ca3efa29fbac409947 (patch)
tree32f27f09ed0048f5a8c960409968638c3bcfe7ad /Services/apache/Dockerfile
parent0c46aa05e68dda40eb7f5b6f25b32a0fe32841a9 (diff)
downloadphpmyadmin-28d5ddd7f63e587d48a985ca3efa29fbac409947.tar.gz
phpmyadmin-28d5ddd7f63e587d48a985ca3efa29fbac409947.tar.bz2
phpmyadmin-28d5ddd7f63e587d48a985ca3efa29fbac409947.tar.xz
phpmyadmin-28d5ddd7f63e587d48a985ca3efa29fbac409947.zip
modification sur le serveur apache
Diffstat (limited to 'Services/apache/Dockerfile')
-rw-r--r--Services/apache/Dockerfile17
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