diff options
| author | startxfr <clarue@startx.fr> | 2015-11-28 05:57:08 +0100 |
|---|---|---|
| committer | startxfr <clarue@startx.fr> | 2015-11-28 05:57:08 +0100 |
| commit | d2b8afc1f219e3db7c776a17c0f03128476ddefa (patch) | |
| tree | c227b2093ed65b18c81a2706c6d386a5e7d37f7a /Applications | |
| parent | ce30e623a04eb19828be26585dba984c68fbf0ec (diff) | |
| download | phpmyadmin-d2b8afc1f219e3db7c776a17c0f03128476ddefa.tar.gz phpmyadmin-d2b8afc1f219e3db7c776a17c0f03128476ddefa.tar.bz2 phpmyadmin-d2b8afc1f219e3db7c776a17c0f03128476ddefa.tar.xz phpmyadmin-d2b8afc1f219e3db7c776a17c0f03128476ddefa.zip | |
switching to fedora 23 in master. Start adding docker-compose support
Diffstat (limited to 'Applications')
| -rwxr-xr-x | Applications/dockerhub_run.sh | 3 | ||||
| -rw-r--r-- | Applications/phpmyadmin/Dockerfile | 4 |
2 files changed, 2 insertions, 5 deletions
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 <dev@startx.fr> -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 |