diff options
| author | chris <cl@startx.fr> | 2014-06-20 19:27:35 +0200 |
|---|---|---|
| committer | chris <cl@startx.fr> | 2014-06-20 19:27:35 +0200 |
| commit | 4c69461903ba2dafda2e3d2c856d86148edf5b07 (patch) | |
| tree | 2923dda8792064d577b2183eac4452b290552357 | |
| parent | 8b6370786114c8491e5ce7150a9ee10d4f5fbf76 (diff) | |
| download | phpmyadmin-4c69461903ba2dafda2e3d2c856d86148edf5b07.tar.gz phpmyadmin-4c69461903ba2dafda2e3d2c856d86148edf5b07.tar.bz2 phpmyadmin-4c69461903ba2dafda2e3d2c856d86148edf5b07.tar.xz phpmyadmin-4c69461903ba2dafda2e3d2c856d86148edf5b07.zip | |
Added sample to the readme and change directory structure
| -rw-r--r-- | Applications/phpmyadmin/Dockerfile | 8 | ||||
| -rw-r--r-- | Applications/phpmyadmin/config.inc.php | 13 | ||||
| -rw-r--r-- | Applications/phpmyadmin/test.php | 4 | ||||
| -rw-r--r-- | Services/mariadb/Dockerfile | 8 | ||||
| -rw-r--r-- | Services/mysql/Dockerfile | 5 | ||||
| -rw-r--r-- | Services/ooconv/Dockerfile | 5 | ||||
| -rw-r--r-- | Services/php/Dockerfile | 5 |
7 files changed, 48 insertions, 0 deletions
diff --git a/Applications/phpmyadmin/Dockerfile b/Applications/phpmyadmin/Dockerfile new file mode 100644 index 0000000..50496f4 --- /dev/null +++ b/Applications/phpmyadmin/Dockerfile @@ -0,0 +1,8 @@ + + +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/Applications/phpmyadmin/config.inc.php b/Applications/phpmyadmin/config.inc.php new file mode 100644 index 0000000..7458071 --- /dev/null +++ b/Applications/phpmyadmin/config.inc.php @@ -0,0 +1,13 @@ +<?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/Applications/phpmyadmin/test.php b/Applications/phpmyadmin/test.php new file mode 100644 index 0000000..a7796a0 --- /dev/null +++ b/Applications/phpmyadmin/test.php @@ -0,0 +1,4 @@ +<?php +print_r($_SERVER); +print_r($_ENV); +?> diff --git a/Services/mariadb/Dockerfile b/Services/mariadb/Dockerfile new file mode 100644 index 0000000..3803812 --- /dev/null +++ b/Services/mariadb/Dockerfile @@ -0,0 +1,8 @@ + + +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/Services/mysql/Dockerfile b/Services/mysql/Dockerfile new file mode 100644 index 0000000..0ab5bd6 --- /dev/null +++ b/Services/mysql/Dockerfile @@ -0,0 +1,5 @@ + + +FROM softinnov/mysql:latest +MAINTAINER startx dev@startx.fr + diff --git a/Services/ooconv/Dockerfile b/Services/ooconv/Dockerfile new file mode 100644 index 0000000..9bde713 --- /dev/null +++ b/Services/ooconv/Dockerfile @@ -0,0 +1,5 @@ + + +FROM maxexcloo/phpmyadmin:latest +MAINTAINER startx dev@startx.fr + diff --git a/Services/php/Dockerfile b/Services/php/Dockerfile new file mode 100644 index 0000000..6a87d06 --- /dev/null +++ b/Services/php/Dockerfile @@ -0,0 +1,5 @@ + + +FROM maxexcloo/nginx-php:latest +MAINTAINER startx dev@startx.fr + |