From 25a402256893d2fcaf9d7c6fd3d82cb20af35851 Mon Sep 17 00:00:00 2001
From: startxfr <clarue@startx.fr>
Date: Sun, 16 Nov 2014 02:39:30 +0100
Subject: 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

---
 Services/php/Dockerfile          | 12 ++++++++++--
 Services/php/welcome_apache.html | 11 +++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 Services/php/welcome_apache.html

(limited to 'Services')

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>
-- 
cgit v1.2.3