summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorroot <root@localhost.localdomain>2014-06-20 22:34:19 +0200
committerroot <root@localhost.localdomain>2014-06-20 22:34:19 +0200
commit26807b960d33b599f1dd7eeb4d990577f6f06aee (patch)
tree42a646b9da07f2a3bd06c9ea1ffac585a74ae003
parentdf26b5f0292b0ea8149c8e9474d4fb906766e42e (diff)
downloadphpmyadmin-26807b960d33b599f1dd7eeb4d990577f6f06aee.tar.gz
phpmyadmin-26807b960d33b599f1dd7eeb4d990577f6f06aee.tar.bz2
phpmyadmin-26807b960d33b599f1dd7eeb4d990577f6f06aee.tar.xz
phpmyadmin-26807b960d33b599f1dd7eeb4d990577f6f06aee.zip
adding individuals readme files for each Image. Changing sample in each
-rw-r--r--Applications/phpmyadmin/README.md4
-rw-r--r--Applications/rockmongo/README.md4
-rw-r--r--README.md25
3 files changed, 21 insertions, 12 deletions
diff --git a/Applications/phpmyadmin/README.md b/Applications/phpmyadmin/README.md
index 906c73e..a52dcea 100644
--- a/Applications/phpmyadmin/README.md
+++ b/Applications/phpmyadmin/README.md
@@ -6,5 +6,5 @@ Based on the [maxexcloo phpmyadmin](https://github.com/maxexcloo/Docker) Dockerf
**Usage**
- docker run --name="app-pma" -p 81:80 -d -e VIRTUAL_HOST=pma.project.dev.startx.fr startx/pma
- docker run --name="app-pma" -d --link mariadb:mariadb -e VIRTUAL_HOST=pma.project.dev.startx.fr startx/app-phpmyadmin
+ docker run --name="test-phpmyadmin" -p 81:80 -d -e VIRTUAL_HOST=pma.project.dev.startx.fr startx/pma
+ docker run --name="test-phpmyadmin" -d --link test-maria:test-maria -e VIRTUAL_HOST=pma.project.dev.startx.fr startx/app-phpmyadmin
diff --git a/Applications/rockmongo/README.md b/Applications/rockmongo/README.md
index 18a4a72..ae847ae 100644
--- a/Applications/rockmongo/README.md
+++ b/Applications/rockmongo/README.md
@@ -6,5 +6,5 @@ Based on the [maxexcloo rockmongo](https://github.com/maxexcloo/Docker) Dockerfi
**Usage**
- docker run --name="app-rm" -p 81:80 -d -e VIRTUAL_HOST=pma.project.dev.startx.fr startx/pma
- docker run --name="app-rm" -d --link mongodb:mongodb -e VIRTUAL_HOST=rm.project.dev.startx.fr startx/app-rockmongo
+ docker run --name="test-rockmongo" -p 81:80 -d -e VIRTUAL_HOST=pma.project.dev.startx.fr startx/pma
+ docker run --name="test-rockmongo" -d --link test-mongo:test-mongo -e VIRTUAL_HOST=rm.project.dev.startx.fr startx/app-rockmongo
diff --git a/README.md b/README.md
index 3859a83..34bcee4 100644
--- a/README.md
+++ b/README.md
@@ -12,30 +12,39 @@ The following commands can be used to deploy some of the services offered by the
- **phpmyadmin**
Based on the [maxexcloo phpmyadmin](https://github.com/maxexcloo/Docker) Dockerfile
- docker run --name="app-pma" -p 81:80 -d -e VIRTUAL_HOST=pma.project.dev.startx.fr startx/pma
- docker run --name="app-pma" -d --link mariadb:mariadb -e VIRTUAL_HOST=pma.project.dev.startx.fr startx/app-phpmyadmin
+ docker run --name="test-phpmyadmin" -p 81:80 -d -e VIRTUAL_HOST=pma.project.dev.startx.fr startx/pma
+ docker run --name="test-phpmyadmin" -d --link maria:maria -e VIRTUAL_HOST=pma.project.dev.startx.fr startx/app-phpmyadmin
- **rockmongo**
Based on the [maxexcloo phpmyadmin](https://github.com/maxexcloo/Docker) Dockerfile
- docker run --name="app-rm" -p 82:80 -d -e VIRTUAL_HOST=rm.project.dev.startx.fr startx/rockmongo
- docker run --name="app-rm" -d --link mongodb:mongodb -e VIRTUAL_HOST=mongo.project.dev.startx.fr startx/app-rockmongo
+ docker run --name="test-rockmongo" -p 82:80 -d -e VIRTUAL_HOST=rm.project.dev.startx.fr startx/rockmongo
+ docker run --name="test-rockmongo" -d --link mongo:mongo -e VIRTUAL_HOST=mongo.project.dev.startx.fr startx/app-rockmongo
- **Services (sv)**
- **php**
+Based on the [tutum php](https://github.com/tutum/apache-php) Dockerfile
- docker run --name="sv-php" -d -e VIRTUAL_HOST=php.project.dev.startx.fr startx/sv-php
+ docker run --name="test-web" -d -e VIRTUAL_HOST=web.project.dev.startx.fr startx/sv-php
- **mariadb**
- docker run --name="sv-mariadb" -d startx/sv-mariadb
+ docker run --name="test-maria" -d startx/sv-maria
- **mongodb**
- docker run --name="sv-mongodb" -d startx/sv-mongodb
+ docker run --name="test-mongo" -d startx/sv-mongo
- **mysqldb**
- docker run --name="sv-mysqldb" -d startx/sv-mysqldb
+ docker run --name="test-mysql" -d startx/sv-mysql
+
+ - **postgres**
+
+ docker run --name="test-postgres" -d startx/sv-postgres
+
+ - **ooconv**
+
+ docker run --name="test-ooconv" -d startx/sv-ooconv