From b16fb60aebdc648c3811413f0f2e5b8b6fb3cf31 Mon Sep 17 00:00:00 2001
From: startxfr <clarue@startx.fr>
Date: Wed, 10 Dec 2014 00:23:13 +0100
Subject: =?UTF-8?q?ajout=20d'un=20titre=20affich=C3=A9=20dans=20github=20+?=
=?UTF-8?q?=20mis=20een=20palce=20var=20d'env=20pour=20apache?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Applications/phpmyadmin/README.md | 3 ++-
Applications/rockmongo/README.md | 3 ++-
OS/Centos/README.md | 3 ++-
OS/Fedora/README.md | 1 +
Services/apache/README.md | 5 +++--
Services/apache/sx/httpd.sh | 6 ++++++
Services/mariadb/README.md | 5 +++--
Services/memcache/README.md | 4 +++-
Services/mongo/README.md | 3 ++-
Services/nodejs/README.md | 3 ++-
Services/ooconv/README.md | 3 ++-
Services/php/README.md | 3 ++-
Services/postgres/README.md | 3 ++-
Services/ssh/README.md | 5 ++++-
14 files changed, 36 insertions(+), 14 deletions(-)
diff --git a/Applications/phpmyadmin/README.md b/Applications/phpmyadmin/README.md
index 4d2de03..7c9f743 100644
--- a/Applications/phpmyadmin/README.md
+++ b/Applications/phpmyadmin/README.md
@@ -1,5 +1,6 @@
# STARTX Application docker-images : PHPMyAdmin
-This container run phpMyAdmin on PHP server running under a fedora server.
+
+Container running phpMyAdmin under a fedora server.
## Running from docker registry
diff --git a/Applications/rockmongo/README.md b/Applications/rockmongo/README.md
index 1174467..10bb5b1 100644
--- a/Applications/rockmongo/README.md
+++ b/Applications/rockmongo/README.md
@@ -1,5 +1,6 @@
# STARTX Application docker-images : Rockmongo
-This container run Rockmongo on PHP server running under a fedora server.
+
+Container running rockmongo under a fedora server.
## Running from docker registry
diff --git a/OS/Centos/README.md b/OS/Centos/README.md
index 7145ef0..69e7d43 100644
--- a/OS/Centos/README.md
+++ b/OS/Centos/README.md
@@ -1,5 +1,6 @@
# STARTX OS docker-images : Fedora
-Fedora image builded with minimal and updated binaries
+
+Centos image builded with minimal and updated binaries
## Running from docker registry
diff --git a/OS/Fedora/README.md b/OS/Fedora/README.md
index 02646e9..3d26fc7 100644
--- a/OS/Fedora/README.md
+++ b/OS/Fedora/README.md
@@ -1,4 +1,5 @@
# STARTX OS docker-images : Fedora
+
Fedora image builded with minimal and updated binaries
## Running from docker registry
diff --git a/Services/apache/README.md b/Services/apache/README.md
index b42fdd0..d775b03 100644
--- a/Services/apache/README.md
+++ b/Services/apache/README.md
@@ -1,5 +1,6 @@
-# STARTX Services docker-images : PHP Webserver
-This container run apache on fedora server.
+# STARTX Services docker-images : Simple Webserver
+
+Container running httpd daemon under a fedora server
## Running from docker registry
diff --git a/Services/apache/sx/httpd.sh b/Services/apache/sx/httpd.sh
index 04f08b4..0220984 100644
--- a/Services/apache/sx/httpd.sh
+++ b/Services/apache/sx/httpd.sh
@@ -1,12 +1,18 @@
#!/bin/bash
export TERM=dumb
+export HTTPDCONF=/etc/httpd/conf.d/sx.conf
# Begin configuration before starting daemonized process
# and start generating host keys
function begin_config {
echo "=> Begin httpd configuration for host $HOSTNAME"
mkdir -p /var/run/httpd
+ if [ -z "$DOCROOT" ]; then
+ echo "===> Changing document root to $DOCROOT"
+ ${DOCROOT=/var/www/html}
+ echo "DocumentRoot \"$DOCROOT\"" >> $HTTPDCONF
+ fi
}
# End configuration process just before starting daemon
diff --git a/Services/mariadb/README.md b/Services/mariadb/README.md
index 76d4842..0636335 100644
--- a/Services/mariadb/README.md
+++ b/Services/mariadb/README.md
@@ -1,5 +1,6 @@
-# STARTX Services docker-images : MongoDB Server
-This container run mariadb on fedora server.
+# STARTX Services docker-images : MariaDB Server
+
+Container running mysqld daemon under a fedora server
## Running from docker registry
diff --git a/Services/memcache/README.md b/Services/memcache/README.md
index a1c1fc7..0f1d59c 100644
--- a/Services/memcache/README.md
+++ b/Services/memcache/README.md
@@ -1,4 +1,6 @@
-# STARTX Services docker-images : PostgreSQL Server
+# STARTX Services docker-images : Memcache Server
+
+Container running memcached daemon under a fedora server
This container run memcached on fedora server.
## Running from docker registry
diff --git a/Services/mongo/README.md b/Services/mongo/README.md
index dcdc1cc..7d212f0 100644
--- a/Services/mongo/README.md
+++ b/Services/mongo/README.md
@@ -1,5 +1,6 @@
# STARTX Services docker-images : MongoDB Server
-This container run mongod on fedora server.
+
+Container running mongod daemon under a fedora server
## Running from docker registry
diff --git a/Services/nodejs/README.md b/Services/nodejs/README.md
index 974d541..de276b4 100644
--- a/Services/nodejs/README.md
+++ b/Services/nodejs/README.md
@@ -1,5 +1,6 @@
# STARTX Services docker-images : NodeJS Server
-This container run nodejs on fedora server.
+
+Container running nodejs daemon under a fedora server
## Running from docker registry
diff --git a/Services/ooconv/README.md b/Services/ooconv/README.md
index 34a232a..ebd62ee 100644
--- a/Services/ooconv/README.md
+++ b/Services/ooconv/README.md
@@ -1,5 +1,6 @@
# STARTX Services docker-images : NodeJS Server
-This container run ooconv on fedora server.
+
+Container running ooconv daemon under a fedora server
## Running from docker registry
diff --git a/Services/php/README.md b/Services/php/README.md
index 7f1161f..2757a6a 100644
--- a/Services/php/README.md
+++ b/Services/php/README.md
@@ -1,5 +1,6 @@
# STARTX Services docker-images : PHP Webserver
-This container run php via apache on fedora server.
+
+Container running apache + php daemon under a fedora server
## Running from docker registry
diff --git a/Services/postgres/README.md b/Services/postgres/README.md
index ebb5b29..06605ec 100644
--- a/Services/postgres/README.md
+++ b/Services/postgres/README.md
@@ -1,5 +1,6 @@
# STARTX Services docker-images : PostgreSQL Server
-This container run postgres on fedora server.
+
+Container running postgres daemon under a fedora server.
## Running from docker registry
diff --git a/Services/ssh/README.md b/Services/ssh/README.md
index 03d326b..b04d68e 100644
--- a/Services/ssh/README.md
+++ b/Services/ssh/README.md
@@ -1,5 +1,6 @@
# STARTX Services docker-images : SSH Server
-This container run sshd on fedora server. You can overwrite /root/.ssh/autorized_keys with your own list of autorized keys.
+
+Container running sshd daemon under a fedora server. You can add your own list of autorized keys
## Running from docker registry
@@ -13,6 +14,8 @@ Copy sources in your docker host
cd startx-docker-images;
git clone https://github.com/startxfr/docker-images.git .
+You can overwrite /root/.ssh/autorized_keys with your own list of autorized keys.
+
Build the container
docker build -t sv-ssh Services/ssh/
--
cgit v1.2.3