From 8b6370786114c8491e5ce7150a9ee10d4f5fbf76 Mon Sep 17 00:00:00 2001
From: chris <cl@startx.fr>
Date: Fri, 20 Jun 2014 19:26:53 +0200
Subject: Added sample to the readme and change directory structure

---
 README.md                 | 35 ++++++++++++++++++++++++++++++++++-
 mariadb/Dockerfile        |  8 --------
 mysql/Dockerfile          |  5 -----
 ooconv/Dockerfile         |  5 -----
 php/Dockerfile            |  5 -----
 phpmyadmin/Dockerfile     |  8 --------
 phpmyadmin/config.inc.php | 13 -------------
 phpmyadmin/test.php       |  4 ----
 8 files changed, 34 insertions(+), 49 deletions(-)
 delete mode 100644 mariadb/Dockerfile
 delete mode 100644 mysql/Dockerfile
 delete mode 100644 ooconv/Dockerfile
 delete mode 100644 php/Dockerfile
 delete mode 100644 phpmyadmin/Dockerfile
 delete mode 100644 phpmyadmin/config.inc.php
 delete mode 100644 phpmyadmin/test.php

diff --git a/README.md b/README.md
index f496e50..8bb087a 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,37 @@
 docker-images
 =============
 
-repository with all docker images used in our IS
+**Description**  
+This repository contains a collection of Docker configurations used in STARTX IS.
+
+**Usage**  
+The following commands can be used to deploy some of the services offered by the Docker containers in this repository.
+
+- **Applications (app)**
+
+  - **phpmyadmin**
+
+          docker run --name="app-pma" -d --link mariadb:mariadb -e VIRTUAL_HOST=pma.project.dev.startx.fr startxfr/app-phpmyadmin
+
+  - **rockmongo**
+
+          docker run --name="app-rm" -d --link mongodb:mongodb -e VIRTUAL_HOST=mongo.project.dev.startx.fr startxfr/app-rockmongo
+
+- **Services (sv)**
+
+  - **php**
+	
+          docker run --name="sv-php" -d -e VIRTUAL_HOST=php.project.dev.startx.fr startxfr/sv-php
+
+  - **mariadb**
+	
+          docker run --name="sv-mariadb" -d startxfr/sv-mariadb
+	
+  - **mongodb** 
+	
+          docker run --name="sv-mongodb" -d startxfr/sv-mongodb
+	
+  - **mysqldb**
+	
+          docker run --name="sv-mysqldb" -d startxfr/sv-mysqldb
+
diff --git a/mariadb/Dockerfile b/mariadb/Dockerfile
deleted file mode 100644
index 3803812..0000000
--- a/mariadb/Dockerfile
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-FROM       openshift/fedora-mariadb:latest
-MAINTAINER startx dev@startx.fr
-
-# test creation a partir d'une autre image
-RUN echo 'post install de mariadb' > /tmp/post
-
diff --git a/mysql/Dockerfile b/mysql/Dockerfile
deleted file mode 100644
index 0ab5bd6..0000000
--- a/mysql/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-FROM       softinnov/mysql:latest
-MAINTAINER startx dev@startx.fr
-
diff --git a/ooconv/Dockerfile b/ooconv/Dockerfile
deleted file mode 100644
index 9bde713..0000000
--- a/ooconv/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-FROM       maxexcloo/phpmyadmin:latest
-MAINTAINER startx dev@startx.fr
-
diff --git a/php/Dockerfile b/php/Dockerfile
deleted file mode 100644
index 6a87d06..0000000
--- a/php/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-FROM       maxexcloo/nginx-php:latest
-MAINTAINER startx dev@startx.fr
-
diff --git a/phpmyadmin/Dockerfile b/phpmyadmin/Dockerfile
deleted file mode 100644
index 50496f4..0000000
--- a/phpmyadmin/Dockerfile
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-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
diff --git a/phpmyadmin/config.inc.php b/phpmyadmin/config.inc.php
deleted file mode 100644
index 7458071..0000000
--- a/phpmyadmin/config.inc.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-// fichier qui provient de l'image startx/pma
-$cfg['blowfish_secret'] = 'SECRET';
-$cfg['PmaNoRelation_DisableWarning'] = true;
-$i = 0;
-$i++;
-$cfg['Servers'][$i]['extension'] = 'mysqli';
-$cfg['Servers'][$i]['host'] = 'mariadb';
-$cfg['Servers'][$i]['controlhost'] = '';
-$cfg['Servers'][$i]['controluser'] = 'root';
-$cfg['Servers'][$i]['controlpass'] = 'secretdemerde';
-
-?>
diff --git a/phpmyadmin/test.php b/phpmyadmin/test.php
deleted file mode 100644
index a7796a0..0000000
--- a/phpmyadmin/test.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-print_r($_SERVER);
-print_r($_ENV);
-?>
-- 
cgit v1.2.3