summaryrefslogtreecommitdiffstats
path: root/Applications/phpmyadmin
diff options
context:
space:
mode:
authorstartxfr <clarue@startx.fr>2014-12-06 01:09:00 +0100
committerstartxfr <clarue@startx.fr>2014-12-06 01:09:00 +0100
commit076db03abf9ac12a057b784a3e0999180ca53543 (patch)
tree86553f1f030a07290a65d1696772488079088e54 /Applications/phpmyadmin
parent391988d9e6ca3dd863d55a2d84189fda6aeb990c (diff)
downloadphpmyadmin-076db03abf9ac12a057b784a3e0999180ca53543.tar.gz
phpmyadmin-076db03abf9ac12a057b784a3e0999180ca53543.tar.bz2
phpmyadmin-076db03abf9ac12a057b784a3e0999180ca53543.tar.xz
phpmyadmin-076db03abf9ac12a057b784a3e0999180ca53543.zip
adding script for automating image generation and starting container for testing and benchmarks
Diffstat (limited to 'Applications/phpmyadmin')
-rw-r--r--Applications/phpmyadmin/Dockerfile6
-rw-r--r--Applications/phpmyadmin/config.php (renamed from Applications/phpmyadmin/config.inc.php)0
2 files changed, 3 insertions, 3 deletions
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.php
index 20e4276..20e4276 100644
--- a/Applications/phpmyadmin/config.inc.php
+++ b/Applications/phpmyadmin/config.php