summaryrefslogtreecommitdiffstats
path: root/Services
diff options
context:
space:
mode:
authorstartxfr <clarue@startx.fr>2014-11-16 02:39:30 +0100
committerstartxfr <clarue@startx.fr>2014-11-16 02:39:30 +0100
commit25a402256893d2fcaf9d7c6fd3d82cb20af35851 (patch)
treedd2d26a81341d48015571e0bda7ef67462873308 /Services
parentbeea97c85e203afcc76ddd4cc40100021de4f62a (diff)
downloadphpmyadmin-25a402256893d2fcaf9d7c6fd3d82cb20af35851.tar.gz
phpmyadmin-25a402256893d2fcaf9d7c6fd3d82cb20af35851.tar.bz2
phpmyadmin-25a402256893d2fcaf9d7c6fd3d82cb20af35851.tar.xz
phpmyadmin-25a402256893d2fcaf9d7c6fd3d82cb20af35851.zip
ajout d'une image fedora pour servir de base. Ajout de la clef ssh cl@alcor. Modif de l'image apache-php pour s'appuyer sur startx/fedora
Diffstat (limited to 'Services')
-rw-r--r--Services/php/Dockerfile12
-rw-r--r--Services/php/welcome_apache.html11
2 files changed, 21 insertions, 2 deletions
diff --git a/Services/php/Dockerfile b/Services/php/Dockerfile
index d1a8beb..5af160a 100644
--- a/Services/php/Dockerfile
+++ b/Services/php/Dockerfile
@@ -1,5 +1,13 @@
+FROM startx/fedora
+MAINTAINER Chistophe LARUE <dev@startx.fr>
+RUN yum -y update && yum clean all
+RUN yum -y install httpd php php-* && yum clean all
+ADD welcome_apache.html /var/www/html/index.html
-FROM tutum/apache-php:latest
-MAINTAINER startx dev@startx.fr
+EXPOSE 80
+# avoid some issues observed with container restart
+RUN rm -rf /run/httpd/*
+
+ENTRYPOINT ["/usr/sbin/apachectl", "-D FOREGROUND"] \ No newline at end of file
diff --git a/Services/php/welcome_apache.html b/Services/php/welcome_apache.html
new file mode 100644
index 0000000..5c9dfd9
--- /dev/null
+++ b/Services/php/welcome_apache.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>STARTX : Fedora + Apache Webserver</title>
+ <meta charset="UTF-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ </head>
+ <body>
+ <div>See <a href="https://registry.hub.docker.com/u/startx/" target="_blank">Docker registry</a></div>
+ </body>
+</html>