summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchris <cl@startx.fr>2014-06-21 00:18:22 +0200
committerchris <cl@startx.fr>2014-06-21 00:18:22 +0200
commitbeea97c85e203afcc76ddd4cc40100021de4f62a (patch)
tree9afd3212274fc0770c0d4cde4ce9a54a28e99bc4
parenta7f045bdb10bf1383795f014377fcbdc98012e74 (diff)
downloadphpmyadmin-beea97c85e203afcc76ddd4cc40100021de4f62a.tar.gz
phpmyadmin-beea97c85e203afcc76ddd4cc40100021de4f62a.tar.bz2
phpmyadmin-beea97c85e203afcc76ddd4cc40100021de4f62a.tar.xz
phpmyadmin-beea97c85e203afcc76ddd4cc40100021de4f62a.zip
adding dependency for ooconv server and exposing 2002 port for this image.
-rw-r--r--README.md2
-rw-r--r--Services/maria/README.md11
-rw-r--r--Services/mongo/README.md7
-rw-r--r--Services/mysql/README.md8
-rw-r--r--Services/ooconv/Dockerfile7
-rw-r--r--Services/ooconv/README.md12
-rw-r--r--Services/php/README.md5
-rw-r--r--Services/postgres/README.md9
8 files changed, 50 insertions, 11 deletions
diff --git a/README.md b/README.md
index 34bcee4..637ead3 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ Based on the [maxexcloo phpmyadmin](https://github.com/maxexcloo/Docker) Dockerf
- **Services (sv)**
- **php**
-Based on the [tutum php](https://github.com/tutum/apache-php) Dockerfile
+Based on the [tutum php](https://registry.hub.docker.com/u/tutum/apache-php) Dockerfile
docker run --name="test-web" -d -e VIRTUAL_HOST=web.project.dev.startx.fr startx/sv-php
diff --git a/Services/maria/README.md b/Services/maria/README.md
index dca570c..f81f3de 100644
--- a/Services/maria/README.md
+++ b/Services/maria/README.md
@@ -1,9 +1,16 @@
docker-images MariaDB
=====================
-**Description**
-Based on the docker default ma Dockerfile
+**Description**
+Based on the [tutum php](https://registry.hub.docker.com/u/tutum/mariadb) Dockerfile
**Usage**
docker run --name="test-maria" -d startx/sv-maria
+
+ docker run --name="test-maria" -d startx/sv-maria
+ docker run -d -p 3306:3306 startx/sv-maria
+ docker run -d -p 3306:3306 --name="test-maria" startx/sv-maria
+
+ docker run -d --name="test-maria" startx/sv-maria // linked to another container
+ docker run -d --name="test-www" --link test-maria:maria startx/sv-php
diff --git a/Services/mongo/README.md b/Services/mongo/README.md
index 63e976f..7b0f9ef 100644
--- a/Services/mongo/README.md
+++ b/Services/mongo/README.md
@@ -2,8 +2,13 @@ STARTX docker-images - MongoDB
==============================
**Description**
-Based on the docker default mongo Dockerfile
+Based on the docker [default mongo](https://registry.hub.docker.com/_/mongo/) Dockerfile
**Usage**
docker run --name="test-mongo" -d startx/sv-mongo
+ docker run -d -p 27017:27017 startx/sv-mongo
+ docker run -d -p 27017:27017 --name="test-mongo" startx/sv-mongo
+
+ docker run -d --name="test-mongo" startx/sv-mongo // linked to another container
+ docker run -d --name="test-www" --link test-mongo:mongo startx/sv-php
diff --git a/Services/mysql/README.md b/Services/mysql/README.md
index 5d31ed3..8e15a2e 100644
--- a/Services/mysql/README.md
+++ b/Services/mysql/README.md
@@ -2,8 +2,12 @@ STARTX docker-images - Mysql
============================
**Description**
-Based on the docker default mysql Dockerfile
+Based on the docker [default mysql](https://registry.hub.docker.com/_/mysql/) Dockerfile
**Usage**
- docker run --name="test-mysql" -d startx/sv-mysql
+ docker run -d -p 3306:3306 startx/sv-mysql
+ docker run -d -p 3306:3306 --name="test-mysql" -e MYSQL_ROOT_PASSWORD=mysecretpassword startx/sv-mysql
+
+ docker run -d --name="test-mysql" startx/sv-mysql // linked to another container
+ docker run -d --name="test-www" --link test-mysql:mysql startx/sv-php
diff --git a/Services/ooconv/Dockerfile b/Services/ooconv/Dockerfile
index 44bc166..0a50a0a 100644
--- a/Services/ooconv/Dockerfile
+++ b/Services/ooconv/Dockerfile
@@ -3,3 +3,10 @@
FROM centos:latest
MAINTAINER startx dev@startx.fr
+CMD rpm -ivh http://pkgs.repoforge.org/rpmforge-release/rpmforge-release-0.5.3-1.el6.rf.x86_64.rpm
+CMD yum install --skip-broken -y --enablerepo=rpmforge unoconv libreoffice-headless libreoffice-writer libreoffice-calc
+COPY unoconv /unoconv
+
+EXPOSE [2002]
+
+CMD ./unoconv --listener
diff --git a/Services/ooconv/README.md b/Services/ooconv/README.md
index b6a57c4..c39bbd8 100644
--- a/Services/ooconv/README.md
+++ b/Services/ooconv/README.md
@@ -6,4 +6,14 @@ Based on the docker default centos Dockerfile
**Usage**
- docker run --name="test-ooconv" -d startx/sv-ooconv
+ docker run --name="test-ooconv" startx/sv-ooconv unoconv
+ docker run -d -p 2002:2002 --name="test-ooconv" startx/sv-ooconv
+
+
+**Converting documents**
+
+ // Start the server
+ unoconv --listener --server 1.2.3.4 --port 2002
+
+ // Use the client to connect to the convertion server
+ unoconv --server 1.2.3.4 --port 2002
diff --git a/Services/php/README.md b/Services/php/README.md
index 03fa696..4844da0 100644
--- a/Services/php/README.md
+++ b/Services/php/README.md
@@ -2,8 +2,9 @@ STARTX docker-images - PHP
==========================
**Description**
-Based on the [tutum php](https://github.com/tutum/apache-php) Dockerfile
+Based on the [tutum php](https://registry.hub.docker.com/u/tutum/apache-php) Dockerfile
**Usage**
- docker run --name="test-www" -d -e VIRTUAL_HOST=php.project.dev.startx.fr startx/sv-php
+ docker run -d -p 80:80 startx/sv-php // minimum to run properly the server
+ docker run -d -p 80:80 --name="test-www" -e VIRTUAL_HOST=php.project.dev.startx.fr startx/sv-php
diff --git a/Services/postgres/README.md b/Services/postgres/README.md
index 8716025..73f4037 100644
--- a/Services/postgres/README.md
+++ b/Services/postgres/README.md
@@ -2,8 +2,13 @@ STARTX docker-images - Postgres
===============================
**Description**
-Based on the docker default postgres Dockerfile
+Based on the docker [default postgres](https://registry.hub.docker.com/u/library/postgres/) Dockerfile
**Usage**
- docker run --name="test-postgres" -d startx/sv-postgres
+ docker run -d -p 5432:5432 startx/sv-postgres
+ docker run -d -p 5432:5432 --name="test-postgres" startx/sv-postgres
+
+ docker run -d --name="test-postgres" startx/sv-postgres // linked to another container
+ docker run -d --name="test-www" --link test-postgres:postgres startx/sv-php
+