From 910a26141f16336c96e304ebe850a4e5a0f97f95 Mon Sep 17 00:00:00 2001
From: startxfr <clarue@startx.fr>
Date: Thu, 20 Nov 2014 09:34:55 +0100
Subject: modif des readme de chaque container pour etre plus expressif
---
Applications/phpmyadmin/README.md | 25 +++++++++---------
Applications/rockmongo/README.md | 37 +++++++++++++++++++++-----
OS/Fedora/README.md | 6 ++---
Services/apache/README.md | 27 ++++++++++---------
Services/mariadb/README.md | 43 ++++++++++++++++++++++---------
Services/memcache/README.md | 39 +++++++++++++++++++---------
Services/mongo/Dockerfile | 2 +-
Services/mongo/README.md | 42 +++++++++++++++++++++++-------
Services/mongo/mongo_run.sh | 2 ++
Services/nodejs/README.md | 28 ++++++++++----------
Services/ooconv/unoconv | 24 ++++++++---------
Services/php/README.md | 24 ++++++++---------
Services/postgres/Dockerfile | 2 +-
Services/postgres/README.md | 41 ++++++++++++++++++++++-------
Services/postgres/postgres_modify_pass.sh | 24 +++++++++++++++++
Services/postgres/postgres_run.sh | 14 ++++++++++
Services/ssh/README.md | 18 ++++++++-----
17 files changed, 268 insertions(+), 130 deletions(-)
create mode 100644 Services/mongo/mongo_run.sh
create mode 100644 Services/postgres/postgres_modify_pass.sh
create mode 100644 Services/postgres/postgres_run.sh
diff --git a/Applications/phpmyadmin/README.md b/Applications/phpmyadmin/README.md
index 59eb6bd..e954532 100644
--- a/Applications/phpmyadmin/README.md
+++ b/Applications/phpmyadmin/README.md
@@ -1,32 +1,31 @@
-# STARTX Application docker-images : PhpMyAdmin
+# STARTX Application docker-images : PHPMyAdmin
+This container run phpMyAdmin on PHP server running under a fedora server.
## Running from docker registry
+ # docker run -it --name="pma" startx/app-pma
- # docker run -d -p 8080:80 --name="test-pma" -e VIRTUAL_HOST=pma.project.startx.fr startx/app-phpmyadmin
-
-## Running from local Dockerfile
-
+## Build and run from local Dockerfile
### Building docker image
Copy the sources to your docker host
- # mkdir startx-docker-images;
- # git clone https://github.com/startxfr/docker-images.git startx-docker-images/
- # cd startx-docker-images/Applications/phpmyadmin/
+ mkdir startx-docker-images;
+ cd startx-docker-images;
+ git clone https://github.com/startxfr/docker-images.git .
and build the container
- # docker build --rm -t <username>/pma .
+ docker build -t startx/app-pma Applications/phpmyadmin/
### Running local image
- # docker run -d -p 8080:80 --name="test-pma" -e VIRTUAL_HOST=pma.project.startx.fr <username>/pma
+ # docker run -d -p 80:80 --name="pma" startx/app-pma
## Accessing server
- # firefox http://localhost:8080
+ # firefox http://localhost/pma
## Related Resources
-
* [Sources files](https://github.com/startxfr/docker-images/tree/master/Applications/phpmyadmin)
* [Github STARTX profile](https://github.com/startxfr/docker-images)
-* [Docker registry for this container](https://registry.hub.docker.com/u/startx/app-phpmyadmin/)
\ No newline at end of file
+* [Docker registry for this container](https://registry.hub.docker.com/u/startx/app-phpmyadmin/)
+* [Docker registry for Fedora](https://registry.hub.docker.com/u/fedora/)
\ No newline at end of file
diff --git a/Applications/rockmongo/README.md b/Applications/rockmongo/README.md
index ae847ae..e023217 100644
--- a/Applications/rockmongo/README.md
+++ b/Applications/rockmongo/README.md
@@ -1,10 +1,33 @@
-STARTX docker-images - RockMongo
-================================
+# STARTX Application docker-images : Rockmongo
+This container run Rockmongo on PHP server running under a fedora server.
-**Description**
-Based on the [maxexcloo rockmongo](https://github.com/maxexcloo/Docker) Dockerfile
+## Running from docker registry
+ # docker run -it --name="rockmongo" startx/app-rockmongo
+
+## Build and run from local Dockerfile
+### Building docker image
+Copy the sources to your docker host
+
+ mkdir startx-docker-images;
+ cd startx-docker-images;
+ git clone https://github.com/startxfr/docker-images.git .
+
+and build the container
+
+ docker build -t startx/app-rockmongo Applications/rockmongo/
+
+### Running local image
+
+ # docker run -d -p 80:80 --name="rockmongo" startx/app-rockmongo
+
+## Accessing server
+
+ # firefox http://localhost/rockmongo
+
+## Related Resources
+* [Sources files](https://github.com/startxfr/docker-images/tree/master/Applications/rockmongo)
+* [Github STARTX profile](https://github.com/startxfr/docker-images)
+* [Docker registry for this container](https://registry.hub.docker.com/u/startx/app-rockmongo/)
+* [Docker registry for Fedora](https://registry.hub.docker.com/u/fedora/)
-**Usage**
- 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/OS/Fedora/README.md b/OS/Fedora/README.md
index 562c758..421f090 100644
--- a/OS/Fedora/README.md
+++ b/OS/Fedora/README.md
@@ -9,12 +9,12 @@ Fedora image builded with minimal and updated binaries
Copy the sources to your docker host
mkdir startx-docker-images;
- # cd startx-docker-images;
- # git clone https://github.com/startxfr/docker-images.git .
+ cd startx-docker-images;
+ git clone https://github.com/startxfr/docker-images.git .
and build the container
- # docker build -t fedora OS/Fedora/
+ docker build -t fedora OS/Fedora/
### Running local image
diff --git a/Services/apache/README.md b/Services/apache/README.md
index f0b0326..b8c3a0e 100644
--- a/Services/apache/README.md
+++ b/Services/apache/README.md
@@ -1,34 +1,33 @@
-# STARTX Services docker-images : Apache-PHP
+# STARTX Services docker-images : PHP Webserver
+This container run apache on fedora server.
## Running from docker registry
- # docker run -d -p 8080:80 --name="test-www" -e VIRTUAL_HOST=www.project.startx.fr startx/sv-php
-
-## Running from local Dockerfile
+ # docker run -d -p 80:80 --name="apache" startx/sv-apache
+## Build and run from local Dockerfile
### Building docker image
Copy the sources to your docker host
- # mkdir startx-docker-images;
- # git clone https://github.com/startxfr/docker-images.git startx-docker-images/
- # cd startx-docker-images/Services/php/
+ mkdir startx-docker-images;
+ cd startx-docker-images;
+ git clone https://github.com/startxfr/docker-images.git .
and build the container
- # docker build --rm -t <username>/www .
+ docker build -t sv-apache Services/apache/
### Running local image
- # docker run -d -p 8080:80 --name="test-www" -e VIRTUAL_HOST=www.project.startx.fr <username>/www
+ # docker run -d -p 80:80 --name="apache" sv-apache
## Accessing server
- # firefox http://localhost:8080
+ # firefox http://localhost
## Related Resources
-
-* [Sources files](https://github.com/startxfr/docker-images/tree/master/Services/php)
+* [Sources files](https://github.com/startxfr/docker-images/tree/master/Services/apache)
* [Github STARTX profile](https://github.com/startxfr/docker-images)
-* [Docker registry for this container](https://registry.hub.docker.com/u/startx/sv-php/)
-* [tutum php](https://registry.hub.docker.com/u/tutum/apache-php)
+* [Docker registry for this container](https://registry.hub.docker.com/u/startx/sv-apache/)
+* [Docker registry for Fedora](https://registry.hub.docker.com/u/fedora/)
diff --git a/Services/mariadb/README.md b/Services/mariadb/README.md
index f81f3de..12c142b 100644
--- a/Services/mariadb/README.md
+++ b/Services/mariadb/README.md
@@ -1,16 +1,35 @@
-docker-images MariaDB
-=====================
+# STARTX Services docker-images : MongoDB Server
+This container run mariadb on fedora server.
-**Description**
-Based on the [tutum php](https://registry.hub.docker.com/u/tutum/mariadb) Dockerfile
+## Running from docker registry
-**Usage**
-
- docker run --name="test-maria" -d startx/sv-maria
+ # docker run -d -p 3306:3306 --name="mariadb" startx/sv-mariadb
+ # when linked to another container
+ # docker run -d --name="mariadb" startx/sv-mariadb
+ # docker run -d --name="php" --link mariadb:mariadb startx/sv-php
- 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
+## Build and run from local Dockerfile
+### Building docker image
+Copy the sources to your docker host
- 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
+ mkdir startx-docker-images;
+ cd startx-docker-images;
+ git clone https://github.com/startxfr/docker-images.git .
+
+and build the container
+
+ docker build -t sv-mariadb Services/mariadb/
+
+### Running local image
+
+ # docker run -d -p 3306:3306 --name="mariadb" sv-mariadb
+
+## Accessing server
+
+ # mysql -h localhost -p 3306
+
+## Related Resources
+* [Sources files](https://github.com/startxfr/docker-images/tree/master/Services/mariadb)
+* [Github STARTX profile](https://github.com/startxfr/docker-images)
+* [Docker registry for this container](https://registry.hub.docker.com/u/startx/sv-mariadb/)
+* [Docker registry for Fedora](https://registry.hub.docker.com/u/fedora/)
\ No newline at end of file
diff --git a/Services/memcache/README.md b/Services/memcache/README.md
index f81f3de..d76d05d 100644
--- a/Services/memcache/README.md
+++ b/Services/memcache/README.md
@@ -1,16 +1,31 @@
-docker-images MariaDB
-=====================
+# STARTX Services docker-images : PostgreSQL Server
+This container run memcached on fedora server.
-**Description**
-Based on the [tutum php](https://registry.hub.docker.com/u/tutum/mariadb) Dockerfile
+## Running from docker registry
-**Usage**
-
- docker run --name="test-maria" -d startx/sv-maria
+ # docker run -d -p 3306:3306 --name="memcache" startx/sv-memcache
+ # when linked to another container
+ # docker run -d --name="memcache" startx/sv-memcache
+ # docker run -d --name="php" --link memcache:memcache startx/sv-php
- 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
+## Build and run from local Dockerfile
+### Building docker image
+Copy the sources to your docker host
- 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
+ mkdir startx-docker-images;
+ cd startx-docker-images;
+ git clone https://github.com/startxfr/docker-images.git .
+
+and build the container
+
+ docker build -t sv-memcache Services/memcache/
+
+### Running local image
+
+ # docker run -d -p 3306:3306 --name="memcache" sv-memcache
+
+## Related Resources
+* [Sources files](https://github.com/startxfr/docker-images/tree/master/Services/memcache)
+* [Github STARTX profile](https://github.com/startxfr/docker-images)
+* [Docker registry for this container](https://registry.hub.docker.com/u/startx/sv-memcache/)
+* [Docker registry for Fedora](https://registry.hub.docker.com/u/fedora/)
\ No newline at end of file
diff --git a/Services/mongo/Dockerfile b/Services/mongo/Dockerfile
index 5367713..aee3456 100644
--- a/Services/mongo/Dockerfile
+++ b/Services/mongo/Dockerfile
@@ -1,5 +1,5 @@
FROM startx/fedora
-MAINTAINER Chistophe LARUE <dev@startx.fr>
+MAINTAINER Christophe LARUE <dev@startx.fr>
COPY mongo_run.sh /bin/
RUN yum -y install \
diff --git a/Services/mongo/README.md b/Services/mongo/README.md
index 7b0f9ef..0e1a2b8 100644
--- a/Services/mongo/README.md
+++ b/Services/mongo/README.md
@@ -1,14 +1,36 @@
-STARTX docker-images - MongoDB
-==============================
+# STARTX Services docker-images : MongoDB Server
+This container run mongod on fedora server.
-**Description**
-Based on the docker [default mongo](https://registry.hub.docker.com/_/mongo/) Dockerfile
+## Running from docker registry
-**Usage**
+ # docker run -d -p 27017:27017 --name="mongo" startx/sv-mongo
+ # when linked to another container
+ # docker run -d --name="mongo" startx/sv-mongo
+ # docker run -d --name="php" --link mongo:mongo startx/sv-php
- 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
+## Build and run from local Dockerfile
+### Building docker image
+Copy the sources to your docker host
+
+ mkdir startx-docker-images;
+ cd startx-docker-images;
+ git clone https://github.com/startxfr/docker-images.git .
+
+and build the container
+
+ docker build -t sv-mongo Services/mongo/
+
+### Running local image
+
+ # docker run -d -p 27017:27017 --name="mongo" sv-mongo
+
+## Accessing server
+
+ # mongo -h localhost -p 27017
+
+## Related Resources
+* [Sources files](https://github.com/startxfr/docker-images/tree/master/Services/mongo)
+* [Github STARTX profile](https://github.com/startxfr/docker-images)
+* [Docker registry for this container](https://registry.hub.docker.com/u/startx/sv-mongo/)
+* [Docker registry for Fedora](https://registry.hub.docker.com/u/fedora/)
- 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/mongo/mongo_run.sh b/Services/mongo/mongo_run.sh
new file mode 100644
index 0000000..09eba06
--- /dev/null
+++ b/Services/mongo/mongo_run.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+/usr/bin/mongod --config /etc/mongodb.conf
\ No newline at end of file
diff --git a/Services/nodejs/README.md b/Services/nodejs/README.md
index f0b0326..d9ce4e5 100644
--- a/Services/nodejs/README.md
+++ b/Services/nodejs/README.md
@@ -1,34 +1,32 @@
-# STARTX Services docker-images : Apache-PHP
+# STARTX Services docker-images : NodeJS Server
+This container run nodejs on fedora server.
## Running from docker registry
- # docker run -d -p 8080:80 --name="test-www" -e VIRTUAL_HOST=www.project.startx.fr startx/sv-php
-
-## Running from local Dockerfile
+ # docker run -d -p 8000:8000 --name="nodejs" startx/sv-nodejs
+## Build and run from local Dockerfile
### Building docker image
Copy the sources to your docker host
- # mkdir startx-docker-images;
- # git clone https://github.com/startxfr/docker-images.git startx-docker-images/
- # cd startx-docker-images/Services/php/
+ mkdir startx-docker-images;
+ cd startx-docker-images;
+ git clone https://github.com/startxfr/docker-images.git .
and build the container
- # docker build --rm -t <username>/www .
+ docker build -t sv-nodejs Services/nodejs/
### Running local image
- # docker run -d -p 8080:80 --name="test-www" -e VIRTUAL_HOST=www.project.startx.fr <username>/www
+ # docker run -d -p 8000:8000 --name="nodejs" sv-nodejs
## Accessing server
- # firefox http://localhost:8080
+ # firefox http://localhost:8000
## Related Resources
-
-* [Sources files](https://github.com/startxfr/docker-images/tree/master/Services/php)
+* [Sources files](https://github.com/startxfr/docker-images/tree/master/Services/nodejs)
* [Github STARTX profile](https://github.com/startxfr/docker-images)
-* [Docker registry for this container](https://registry.hub.docker.com/u/startx/sv-php/)
-* [tutum php](https://registry.hub.docker.com/u/tutum/apache-php)
-
+* [Docker registry for this container](https://registry.hub.docker.com/u/startx/sv-nodejs/)
+* [Docker registry for Fedora](https://registry.hub.docker.com/u/fedora/)
\ No newline at end of file
diff --git a/Services/ooconv/unoconv b/Services/ooconv/unoconv
index 972e962..2a4a146 100755
--- a/Services/ooconv/unoconv
+++ b/Services/ooconv/unoconv
@@ -128,12 +128,12 @@ def find_offices():
libpath = realpath(basepath, basis, 'program')
officelibrary = realpath(libpath, lib)
info(3, "Found %s in %s" % (lib, libpath))
- # Break the inner loop...
+ Break the inner loop...
break
- # Continue if the inner loop wasn't broken.
+ Continue if the inner loop wasn't broken.
else:
continue
- # Inner loop was broken, break the outer.
+ Inner loop was broken, break the outer.
break
else:
continue
@@ -146,12 +146,12 @@ def find_offices():
unopath = realpath(basepath, basis, 'program')
officebinary = realpath(unopath, bin)
info(3, "Found %s in %s" % (bin, unopath))
- # Break the inner loop...
+ Break the inner loop...
break
- # Continue if the inner loop wasn't broken.
+ Continue if the inner loop wasn't broken.
else:
continue
- # Inner loop was broken, break the outer.
+ Inner loop was broken, break the outer.
break
else:
continue
@@ -163,12 +163,12 @@ def find_offices():
if os.path.isfile(realpath(basepath, basis, ure, 'lib', 'unorc')):
urepath = realpath(basepath, basis, ure)
info(3, "Found %s in %s" % ('unorc', realpath(urepath, 'lib')))
- # Break the inner loop...
+ Break the inner loop...
break
- # Continue if the inner loop wasn't broken.
+ Continue if the inner loop wasn't broken.
else:
continue
- # Inner loop was broken, break the outer.
+ Inner loop was broken, break the outer.
break
pythonhome = None
@@ -862,7 +862,7 @@ class Convertor:
try:
document.updateLinks()
except AttributeError:
- # the document doesn't implement the XLinkUpdate interface
+ the document doesn't implement the XLinkUpdate interface
pass
### Update document indexes
@@ -871,8 +871,8 @@ class Convertor:
document.refresh()
indexes = document.getDocumentIndexes()
except AttributeError:
- # the document doesn't implement the XRefreshable and/or
- # XDocumentIndexesSupplier interfaces
+ the document doesn't implement the XRefreshable and/or
+ XDocumentIndexesSupplier interfaces
pass
else:
for i in range(0, indexes.getCount()):
diff --git a/Services/php/README.md b/Services/php/README.md
index f0b0326..1da6266 100644
--- a/Services/php/README.md
+++ b/Services/php/README.md
@@ -1,34 +1,32 @@
-# STARTX Services docker-images : Apache-PHP
+# STARTX Services docker-images : PHP Webserver
+This container run php via apache on fedora server.
## Running from docker registry
- # docker run -d -p 8080:80 --name="test-www" -e VIRTUAL_HOST=www.project.startx.fr startx/sv-php
-
-## Running from local Dockerfile
+ # docker run -d -p 80:80 --name="php" startx/sv-php
+## Build and run from local Dockerfile
### Building docker image
Copy the sources to your docker host
- # mkdir startx-docker-images;
- # git clone https://github.com/startxfr/docker-images.git startx-docker-images/
- # cd startx-docker-images/Services/php/
+ mkdir startx-docker-images;
+ cd startx-docker-images;
+ git clone https://github.com/startxfr/docker-images.git .
and build the container
- # docker build --rm -t <username>/www .
+ docker build -t sv-php Services/php/
### Running local image
- # docker run -d -p 8080:80 --name="test-www" -e VIRTUAL_HOST=www.project.startx.fr <username>/www
+ # docker run -d -p 80:80 --name="php" sv-php
## Accessing server
- # firefox http://localhost:8080
+ # firefox http://localhost
## Related Resources
-
* [Sources files](https://github.com/startxfr/docker-images/tree/master/Services/php)
* [Github STARTX profile](https://github.com/startxfr/docker-images)
* [Docker registry for this container](https://registry.hub.docker.com/u/startx/sv-php/)
-* [tutum php](https://registry.hub.docker.com/u/tutum/apache-php)
-
+* [Docker registry for Fedora](https://registry.hub.docker.com/u/fedora/)
\ No newline at end of file
diff --git a/Services/postgres/Dockerfile b/Services/postgres/Dockerfile
index 7997d9d..e863a45 100644
--- a/Services/postgres/Dockerfile
+++ b/Services/postgres/Dockerfile
@@ -1,5 +1,5 @@
FROM startx/fedora
-MAINTAINER Chistophe LARUE <dev@startx.fr>
+MAINTAINER Christophe LARUE <dev@startx.fr>
COPY postgres_run.sh postgres_modify_pass.sh /bin/
RUN yum -y install \
diff --git a/Services/postgres/README.md b/Services/postgres/README.md
index 73f4037..40881af 100644
--- a/Services/postgres/README.md
+++ b/Services/postgres/README.md
@@ -1,14 +1,35 @@
-STARTX docker-images - Postgres
-===============================
+# STARTX Services docker-images : PostgreSQL Server
+This container run postgres on fedora server.
-**Description**
-Based on the docker [default postgres](https://registry.hub.docker.com/u/library/postgres/) Dockerfile
+## Running from docker registry
-**Usage**
-
- docker run -d -p 5432:5432 startx/sv-postgres
- docker run -d -p 5432:5432 --name="test-postgres" startx/sv-postgres
+ # docker run -d -p 5432:5432 --name="postgres" startx/sv-postgres
+ # when linked to another container
+ # docker run -d --name="postgres" startx/sv-postgres
+ # docker run -d --name="php" --link postgres:postgres startx/sv-php
- 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
+## Build and run from local Dockerfile
+### Building docker image
+Copy the sources to your docker host
+ mkdir startx-docker-images;
+ cd startx-docker-images;
+ git clone https://github.com/startxfr/docker-images.git .
+
+and build the container
+
+ docker build -t sv-postgres Services/postgres/
+
+### Running local image
+
+ # docker run -d -p 5432:5432 --name="postgres" sv-postgres
+
+## Accessing server
+
+ # psql -U postgres -h localhost -p 5432
+
+## Related Resources
+* [Sources files](https://github.com/startxfr/docker-images/tree/master/Services/postgres)
+* [Github STARTX profile](https://github.com/startxfr/docker-images)
+* [Docker registry for this container](https://registry.hub.docker.com/u/startx/sv-postgres/)
+* [Docker registry for Fedora](https://registry.hub.docker.com/u/fedora/)
diff --git a/Services/postgres/postgres_modify_pass.sh b/Services/postgres/postgres_modify_pass.sh
new file mode 100644
index 0000000..d76e189
--- /dev/null
+++ b/Services/postgres/postgres_modify_pass.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+if [ -f /.postgres_pass_modified ]; then
+ echo "PostgreSQL 'postgres' user pass already modified!"
+ exit 0
+fi
+
+#generate pasword
+PASS=${POSTGRES_PASS:-$(pwgen -s 12 1)}
+_word=$( [ ${POSTGRES_PASS} ] && echo "preset" || echo "random" )
+
+echo "=> Modifying 'postgres' user with a ${_word} password in PostgreSQL"
+sudo -u postgres psql -U postgres -d postgres -c "alter user postgres with password '$PASS';"
+echo "=> Done!"
+touch /.postgres_pass_modified
+
+echo "========================================================================"
+echo "You can now connect to this PostgreSQL Server using:"
+echo ""
+echo " psql -h <host> -p <port> --username=postgres"
+echo "and enter the password '$PASS' when prompted"
+echo ""
+echo "Please remember to change the above password as soon as possible!"
+echo "========================================================================"
\ No newline at end of file
diff --git a/Services/postgres/postgres_run.sh b/Services/postgres/postgres_run.sh
new file mode 100644
index 0000000..dfbc232
--- /dev/null
+++ b/Services/postgres/postgres_run.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+#change the password
+service postgresql start >/dev/null 2>&1
+if [ ! -f /.postgres_pass_modified ]; then
+ /postgres_modify_pass.sh
+fi
+service postgresql stop >/dev/null 2>&1
+
+#start PostgreSQL
+sudo -u postgres /usr/lib/postgresql/9.3/bin/postgres -D /var/lib/postgresql/9.3/main -c config_file=/etc/postgresql/9.3/main/postgresql.conf
+
+
+exec /usr/libexec/mysqld
\ No newline at end of file
diff --git a/Services/ssh/README.md b/Services/ssh/README.md
index 3417d98..6f73ac4 100644
--- a/Services/ssh/README.md
+++ b/Services/ssh/README.md
@@ -8,21 +8,25 @@ This container run sshd on fedora server. You can overwrite /root/.ssh/autorized
## Build and run from local Dockerfile
### Building docker image
Copy the sources to your docker host
- # mkdir startx-docker-images;
- # cd startx-docker-images;
- # git clone https://github.com/startxfr/docker-images.git .
+
+ mkdir startx-docker-images;
+ cd startx-docker-images;
+ git clone https://github.com/startxfr/docker-images.git .
and build the container
- # docker build -t sv-ssh Services/ssh/
+
+ docker build -t sv-ssh Services/ssh/
### Running local image
+
# docker run -d -p 22022:22 --name="ssh" sv-ssh
## Accessing server
+
# ssh -p 22022 root@<containerId>
## Related Resources
-* [Sources files](https://github.com/startxfr/docker-images/tree/master/OS/Fedora)
+* [Sources files](https://github.com/startxfr/docker-images/tree/master/Services/ssh)
* [Github STARTX profile](https://github.com/startxfr/docker-images)
-* [Docker registry for this container](https://registry.hub.docker.com/u/startx/fedora/)
-* [Docker registry for Fedora](https://registry.hub.docker.com/u/fedora/ssh/)
+* [Docker registry for this container](https://registry.hub.docker.com/u/startx/sv-ssh/)
+* [Docker registry for Fedora](https://registry.hub.docker.com/u/fedora/)
--
cgit v1.2.3