From 076db03abf9ac12a057b784a3e0999180ca53543 Mon Sep 17 00:00:00 2001 From: startxfr Date: Sat, 6 Dec 2014 01:09:00 +0100 Subject: adding script for automating image generation and starting container for testing and benchmarks --- Applications/dockerhub_run.sh | 3 +++ Applications/local_build.sh | 3 +++ Applications/local_run.sh | 3 +++ Applications/phpmyadmin/Dockerfile | 6 +++--- Applications/phpmyadmin/config.inc.php | 13 ------------- Applications/phpmyadmin/config.php | 13 +++++++++++++ 6 files changed, 25 insertions(+), 16 deletions(-) create mode 100755 Applications/dockerhub_run.sh create mode 100755 Applications/local_build.sh create mode 100755 Applications/local_run.sh delete mode 100644 Applications/phpmyadmin/config.inc.php create mode 100644 Applications/phpmyadmin/config.php (limited to 'Applications') diff --git a/Applications/dockerhub_run.sh b/Applications/dockerhub_run.sh new file mode 100755 index 0000000..2c25afb --- /dev/null +++ b/Applications/dockerhub_run.sh @@ -0,0 +1,3 @@ +#!/bin/bash +docker run -d -p 84:80 --name="pma" startx/app-pma +docker run -d -p 86:80 --name="rockmongo" startx/app-rockmongo \ No newline at end of file diff --git a/Applications/local_build.sh b/Applications/local_build.sh new file mode 100755 index 0000000..975a33e --- /dev/null +++ b/Applications/local_build.sh @@ -0,0 +1,3 @@ +#!/bin/bash +docker build -t app-pma Applications/phpmyadmin/ +docker build -t app-rockmongo Applications/rockmongo/ \ No newline at end of file diff --git a/Applications/local_run.sh b/Applications/local_run.sh new file mode 100755 index 0000000..3ae7183 --- /dev/null +++ b/Applications/local_run.sh @@ -0,0 +1,3 @@ +#!/bin/bash +docker run -d -p 85:80 --name="lbpma" app-pma +docker run -d -p 87:80 --name="lbrockmongo" app-rockmongo \ No newline at end of file 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 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 @@ - 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 @@ + -- cgit v1.2.3