Adding rockmongo and using good and mostly 'official' template providers for our basic images. Changing readme accordingly.

8 files changed, 29 insertions, 12 deletions

diff --git a/Applications/rockmongo/Dockerfile b/Applications/rockmongo/Dockerfile
new file mode 100644
index 0000000..b3ae35a
--- /dev/null
+++ b/Applications/rockmongo/Dockerfile
@@ -0,0 +1,4 @@
+
+
+FROM       openshift/centos-rockmongo:latest
+MAINTAINER startx dev@startx.fr
diff --git a/README.md b/README.md
index 8bb087a..7c2ed05 100644
--- a/README.md
+++ b/README.md
@@ -10,28 +10,32 @@ The following commands can be used to deploy some of the services offered by the
 - **Applications (app)**
 
   - **phpmyadmin**
+Based on the [maxexcloo phpmyadmin|https://github.com/maxexcloo/Docker] Dockerfile
 
-          docker run --name="app-pma" -d --link mariadb:mariadb -e VIRTUAL_HOST=pma.project.dev.startx.fr startxfr/app-phpmyadmin
+          docker run --name="app-pma" -p 81:80 -d -e VIRTUAL_HOST=pma.project.dev.startx.fr startx/pma
+          docker run --name="app-pma" -d --link mariadb:mariadb -e VIRTUAL_HOST=pma.project.dev.startx.fr startx/app-phpmyadmin
 
   - **rockmongo**
+Based on the [maxexcloo phpmyadmin|https://github.com/maxexcloo/Docker] Dockerfile
 
-          docker run --name="app-rm" -d --link mongodb:mongodb -e VIRTUAL_HOST=mongo.project.dev.startx.fr startxfr/app-rockmongo
+          docker run --name="app-rm" -p 82:80 -d -e VIRTUAL_HOST=rm.project.dev.startx.fr startx/rockmongo
+          docker run --name="app-rm" -d --link mongodb:mongodb -e VIRTUAL_HOST=mongo.project.dev.startx.fr startx/app-rockmongo
 
 - **Services (sv)**
 
   - **php**
 	
-          docker run --name="sv-php" -d -e VIRTUAL_HOST=php.project.dev.startx.fr startxfr/sv-php
+          docker run --name="sv-php" -d -e VIRTUAL_HOST=php.project.dev.startx.fr startx/sv-php
 
   - **mariadb**
 	
-          docker run --name="sv-mariadb" -d startxfr/sv-mariadb
+          docker run --name="sv-mariadb" -d startx/sv-mariadb
 	
   - **mongodb** 
 	
-          docker run --name="sv-mongodb" -d startxfr/sv-mongodb
+          docker run --name="sv-mongodb" -d startx/sv-mongodb
 	
   - **mysqldb**
 	
-          docker run --name="sv-mysqldb" -d startxfr/sv-mysqldb
+          docker run --name="sv-mysqldb" -d startx/sv-mysqldb
 
diff --git a/Services/mariadb/Dockerfile b/Services/mariadb/Dockerfile
index 3803812..36b987d 100644
--- a/Services/mariadb/Dockerfile
+++ b/Services/mariadb/Dockerfile
@@ -1,8 +1,6 @@
 
 
-FROM       openshift/fedora-mariadb:latest
+FROM       tutum/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/Services/mongodb/Dockerfile b/Services/mongodb/Dockerfile
new file mode 100644
index 0000000..76d7a2f
--- /dev/null
+++ b/Services/mongodb/Dockerfile
@@ -0,0 +1,6 @@
+
+
+FROM       mongo:latest
+MAINTAINER startx dev@startx.fr
+
+
diff --git a/Services/mysql/Dockerfile b/Services/mysql/Dockerfile
index 0ab5bd6..cbb6d9c 100644
--- a/Services/mysql/Dockerfile
+++ b/Services/mysql/Dockerfile
@@ -1,5 +1,5 @@
 
 
-FROM       softinnov/mysql:latest
+FROM       mysql:latest
 MAINTAINER startx dev@startx.fr
 
diff --git a/Services/ooconv/Dockerfile b/Services/ooconv/Dockerfile
index 9bde713..44bc166 100644
--- a/Services/ooconv/Dockerfile
+++ b/Services/ooconv/Dockerfile
@@ -1,5 +1,5 @@
 
 
-FROM       maxexcloo/phpmyadmin:latest
+FROM       centos:latest
 MAINTAINER startx dev@startx.fr
 
diff --git a/Services/php/Dockerfile b/Services/php/Dockerfile
index 6a87d06..d1a8beb 100644
--- a/Services/php/Dockerfile
+++ b/Services/php/Dockerfile
@@ -1,5 +1,5 @@
 
 
-FROM       maxexcloo/nginx-php:latest
+FROM       tutum/apache-php:latest
 MAINTAINER startx dev@startx.fr
 
diff --git a/Services/postgres/Dockerfile b/Services/postgres/Dockerfile
new file mode 100644
index 0000000..f16fe0c
--- /dev/null
+++ b/Services/postgres/Dockerfile
@@ -0,0 +1,5 @@
+
+FROM       postgres:latest
+MAINTAINER startx dev@startx.fr
+
+