From 076db03abf9ac12a057b784a3e0999180ca53543 Mon Sep 17 00:00:00 2001
From: startxfr <clarue@startx.fr>
Date: Sat, 6 Dec 2014 01:09:00 +0100
Subject: adding script for automating image generation and starting container
 for testing and benchmarks

---
 Applications/phpmyadmin/Dockerfile     |  6 +++---
 Applications/phpmyadmin/config.inc.php | 13 -------------
 Applications/phpmyadmin/config.php     | 13 +++++++++++++
 3 files changed, 16 insertions(+), 16 deletions(-)
 delete mode 100644 Applications/phpmyadmin/config.inc.php
 create mode 100644 Applications/phpmyadmin/config.php

(limited to 'Applications/phpmyadmin')

diff --git a/Applications/phpmyadmin/Dockerfile b/Applications/phpmyadmin/Dockerfile
index e17dbef..d63c460 100644
--- a/Applications/phpmyadmin/Dockerfile
+++ b/Applications/phpmyadmin/Dockerfile
@@ -3,10 +3,10 @@ MAINTAINER Christophe LARUE <dev@startx.fr>
 
 RUN yum -y install phpMyAdmin \
     && yum clean all
-COPY config.inc.php /etc/phpMyAdmin/config.inc.php
+COPY config.php /etc/phpMyAdmin/config.inc.php
 COPY test.php /var/www/html/test.php
 
 EXPOSE 80
 EXPOSE 443
-
-ENTRYPOINT ["/usr/sbin/apachectl", "-D FOREGROUND"]
\ No newline at end of file
+VOLUME ["/var/www/html", "/var/log/httpd"]
+CMD ["/sx/httpd_run.sh"]
\ No newline at end of file
diff --git a/Applications/phpmyadmin/config.inc.php b/Applications/phpmyadmin/config.inc.php
deleted file mode 100644
index 20e4276..0000000
--- a/Applications/phpmyadmin/config.inc.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-// fichier qui provient du container startx/app-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/config.php b/Applications/phpmyadmin/config.php
new file mode 100644
index 0000000..20e4276
--- /dev/null
+++ b/Applications/phpmyadmin/config.php
@@ -0,0 +1,13 @@
+<?php
+// fichier qui provient du container startx/app-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';
+
+?>
-- 
cgit v1.2.3