summaryrefslogtreecommitdiffstats
path: root/Services
diff options
context:
space:
mode:
authorroot <root@localhost.localdomain>2014-06-20 20:53:18 +0200
committerroot <root@localhost.localdomain>2014-06-20 20:53:18 +0200
commit3e50ca36886536dbdbdceac2da6f6d77186de485 (patch)
tree6bdef4eea16c028fa15cb1e8e1327a70038cd8ae /Services
parent4c69461903ba2dafda2e3d2c856d86148edf5b07 (diff)
downloadphpmyadmin-3e50ca36886536dbdbdceac2da6f6d77186de485.tar.gz
phpmyadmin-3e50ca36886536dbdbdceac2da6f6d77186de485.tar.bz2
phpmyadmin-3e50ca36886536dbdbdceac2da6f6d77186de485.tar.xz
phpmyadmin-3e50ca36886536dbdbdceac2da6f6d77186de485.zip
Adding rockmongo and using good and mostly 'official' template providers for our basic images. Changing readme accordingly.
Diffstat (limited to 'Services')
-rw-r--r--Services/mariadb/Dockerfile4
-rw-r--r--Services/mongodb/Dockerfile6
-rw-r--r--Services/mysql/Dockerfile2
-rw-r--r--Services/ooconv/Dockerfile2
-rw-r--r--Services/php/Dockerfile2
-rw-r--r--Services/postgres/Dockerfile5
6 files changed, 15 insertions, 6 deletions
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
+
+