From 631b1064d7d21eb05d11a5cdfa186c7195a2613c Mon Sep 17 00:00:00 2001
From: startxfr <clarue@startx.fr>
Date: Sun, 16 Nov 2014 03:40:05 +0100
Subject: modif du readme de fedora

---
 Applications/phpmyadmin/Dockerfile     | 14 +++++++------
 Applications/phpmyadmin/README.md      | 36 +++++++++++++++++++++++++++-------
 Applications/phpmyadmin/config.inc.php |  2 +-
 3 files changed, 38 insertions(+), 14 deletions(-)

(limited to 'Applications')

diff --git a/Applications/phpmyadmin/Dockerfile b/Applications/phpmyadmin/Dockerfile
index 50496f4..852e8b1 100644
--- a/Applications/phpmyadmin/Dockerfile
+++ b/Applications/phpmyadmin/Dockerfile
@@ -1,8 +1,10 @@
+FROM startx/sv-php
+MAINTAINER Chistophe LARUE <dev@startx.fr>
 
+RUN yum -y update && yum clean all
+RUN yum -y install phpMyAdmin && yum clean all
+ADD config.inc.php /etc/phpMyAdmin/config.inc.php
+ADD test.php /var/www/html/test.php
 
-FROM       maxexcloo/phpmyadmin:latest
-MAINTAINER startx dev@startx.fr
-
-# ajout de la conf personnalisée pour les app startx
-ADD config.inc.php /data/http/config.inc.php
-ADD test.php /data/http/test.php
+EXPOSE 80
+ENTRYPOINT ["/usr/sbin/apachectl", "-D FOREGROUND"]
\ No newline at end of file
diff --git a/Applications/phpmyadmin/README.md b/Applications/phpmyadmin/README.md
index a52dcea..59eb6bd 100644
--- a/Applications/phpmyadmin/README.md
+++ b/Applications/phpmyadmin/README.md
@@ -1,10 +1,32 @@
-STARTX docker-images - PhpMyAdmin
-=================================
+# STARTX Application docker-images : PhpMyAdmin
 
-**Description**  
-Based on the [maxexcloo phpmyadmin](https://github.com/maxexcloo/Docker) Dockerfile
+## Running from docker registry
 
-**Usage**  
+	# docker run -d -p 8080:80 --name="test-pma" -e VIRTUAL_HOST=pma.project.startx.fr startx/app-phpmyadmin
 
-          docker run --name="test-phpmyadmin" -p 81:80 -d -e VIRTUAL_HOST=pma.project.dev.startx.fr startx/pma
-          docker run --name="test-phpmyadmin" -d --link test-maria:test-maria -e VIRTUAL_HOST=pma.project.dev.startx.fr startx/app-phpmyadmin
+## Running from local Dockerfile
+
+### Building docker image
+Copy the sources to your docker host 
+
+	# mkdir startx-docker-images;
+	# git clone https://github.com/startxfr/docker-images.git startx-docker-images/
+	# cd startx-docker-images/Applications/phpmyadmin/
+
+and build the container
+
+	# docker build --rm -t <username>/pma .
+
+### Running local image
+
+	# docker run -d -p 8080:80 --name="test-pma" -e VIRTUAL_HOST=pma.project.startx.fr <username>/pma
+
+## Accessing server
+
+	# firefox http://localhost:8080
+
+## Related Resources
+
+* [Sources files](https://github.com/startxfr/docker-images/tree/master/Applications/phpmyadmin)
+* [Github STARTX profile](https://github.com/startxfr/docker-images)
+* [Docker registry for this container](https://registry.hub.docker.com/u/startx/app-phpmyadmin/)
\ No newline at end of file
diff --git a/Applications/phpmyadmin/config.inc.php b/Applications/phpmyadmin/config.inc.php
index 7458071..20e4276 100644
--- a/Applications/phpmyadmin/config.inc.php
+++ b/Applications/phpmyadmin/config.inc.php
@@ -1,5 +1,5 @@
 <?php
-// fichier qui provient de l'image startx/pma
+// fichier qui provient du container startx/app-pma
 $cfg['blowfish_secret'] = 'SECRET';
 $cfg['PmaNoRelation_DisableWarning'] = true;
 $i = 0;
-- 
cgit v1.2.3