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

---
 phpmyadmin/Dockerfile     |  8 --------
 phpmyadmin/config.inc.php | 13 -------------
 phpmyadmin/test.php       |  4 ----
 3 files changed, 25 deletions(-)
 delete mode 100644 phpmyadmin/Dockerfile
 delete mode 100644 phpmyadmin/config.inc.php
 delete mode 100644 phpmyadmin/test.php

(limited to 'phpmyadmin')

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