From d2b8afc1f219e3db7c776a17c0f03128476ddefa Mon Sep 17 00:00:00 2001 From: startxfr Date: Sat, 28 Nov 2015 05:57:08 +0100 Subject: switching to fedora 23 in master. Start adding docker-compose support --- Applications/dockerhub_run.sh | 3 --- Applications/phpmyadmin/Dockerfile | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) delete mode 100755 Applications/dockerhub_run.sh (limited to 'Applications') diff --git a/Applications/dockerhub_run.sh b/Applications/dockerhub_run.sh deleted file mode 100755 index 2c25afb..0000000 --- a/Applications/dockerhub_run.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/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/phpmyadmin/Dockerfile b/Applications/phpmyadmin/Dockerfile index d63c460..416b66b 100644 --- a/Applications/phpmyadmin/Dockerfile +++ b/Applications/phpmyadmin/Dockerfile @@ -1,8 +1,8 @@ FROM startx/sv-php MAINTAINER Christophe LARUE -RUN yum -y install phpMyAdmin \ - && yum clean all +RUN dnf -y install phpMyAdmin \ + && dnf clean all COPY config.php /etc/phpMyAdmin/config.inc.php COPY test.php /var/www/html/test.php -- cgit v1.2.3