From 1af7a22460dafe12f22f9b564d946f3d583f4cb0 Mon Sep 17 00:00:00 2001
From: startxfr <clarue@startx.fr>
Date: Sun, 6 Dec 2015 03:44:47 +0100
Subject: debuging images and improve startup display
---
OS/Dockerfile | 2 +-
OS/README.md | 2 +-
OS/sx-lib.sh | 12 ++++++----
Services/apache/README.md | 4 ++--
Services/apache/docker-compose.yml | 4 ++--
Services/apache/sx-httpd.sh | 6 ++---
Services/mariadb/README.md | 4 ++--
Services/mariadb/docker-compose.yml | 2 +-
Services/mariadb/run.sh | 23 +++++++++---------
Services/memcache/README.md | 12 +++++-----
Services/memcache/docker-compose.yml | 2 +-
Services/memcache/run.sh | 6 ++---
Services/mongo/README.md | 12 +++++-----
Services/mongo/docker-compose.yml | 4 ++--
Services/mongo/run.sh | 6 ++---
Services/nodejs/README.md | 4 ++--
Services/nodejs/docker-compose.yml | 2 +-
Services/nodejs/run.sh | 8 +++----
Services/ooconv/README.md | 12 +++++-----
Services/ooconv/docker-compose.yml | 2 +-
Services/ooconv/run.sh | 10 ++++----
Services/php/README.md | 4 ++--
Services/php/docker-compose.yml | 4 ++--
Services/php/run.sh | 45 ++++++++++++++++++++++++++++++++----
Services/postgres/Dockerfile | 3 ++-
Services/postgres/README.md | 4 ++--
Services/postgres/docker-compose.yml | 2 +-
Services/postgres/run.sh | 6 ++---
docker-compose-app.yml | 8 +------
docker-compose-sv.yml | 19 ---------------
docker-compose.yml | 27 +---------------------
31 files changed, 126 insertions(+), 135 deletions(-)
diff --git a/OS/Dockerfile b/OS/Dockerfile
index 769a43e..b38b1f3 100644
--- a/OS/Dockerfile
+++ b/OS/Dockerfile
@@ -5,7 +5,7 @@ USER root
# Install minimal packages
RUN dnf -y install deltarpm pwgen tar python-dnf-plugins-extras-migrate && \
dnf-2 migrate && \
- dnf -y install psmisc procps coreutils findutils wget logrotate zip && \
+ dnf -y install psmisc procps coreutils findutils iputils net-tools wget logrotate zip && \
dnf clean all
COPY *.sh /bin/
RUN chmod 775 /bin/sx-lib.sh /bin/run.sh && \
diff --git a/OS/README.md b/OS/README.md
index 9efaeb7..556e3a8 100644
--- a/OS/README.md
+++ b/OS/README.md
@@ -20,7 +20,7 @@ This container contain updated core OS rpm (kernel, libs,...) as well as usefull
| Version | Docker Hub repository | Fedora distribution |
|------------|-------------------------------------------------------------------------|---------------------------------------------|
-| Latest | [`startx/fedora:latest`](https://hub.docker.com/r/startx/fedora) | Fedora 23 (kernel 4.2 + GNU 3.18 ) |
+| Latest | [`startx/fedora:latest`](https://hub.docker.com/r/startx/fedora) | Fedora 24 (kernel 4.2 + GNU 3.18 ) |
| 23 | [`startx/fedora:23`](https://hub.docker.com/r/startx/fedora) | Fedora 23 (kernel 4.2 + GNU 3.18 ) |
| 22 | [`startx/fedora:22`](https://hub.docker.com/r/startx/fedora) | Fedora 22 (kernel 4.0 + GNU 3.16 ) |
| 21 | [`startx/fedora:21`](https://hub.docker.com/r/startx/fedora) | Fedora 21 (kernel 3.16 + GNU 3.14 ) |
diff --git a/OS/sx-lib.sh b/OS/sx-lib.sh
index 7d6aac2..0df6f9c 100644
--- a/OS/sx-lib.sh
+++ b/OS/sx-lib.sh
@@ -16,8 +16,10 @@ function check_environment {
echo "! WARNING : auto-assigned value : $CONTAINER_SERVICE"
fi
if [ ! -v CONTAINER_INSTANCE ]; then
- echo "ERROR : environment var CONTAINER_INSTANCE is missing. EXIT !!!"
- exit 1;
+ CONTAINER_INSTANCE=$CONTAINER_TYPE "_" $CONTAINER_SERVICE;
+ export CONTAINER_INSTANCE;
+ echo "! WARNING : environment var CONTAINER_INSTANCE is missing..."
+ echo "! WARNING : auto-assigned value : $CONTAINER_INSTANCE"
fi
}
@@ -28,12 +30,12 @@ function display_container_header {
if [ -v CONTAINER_TYPE ]; then
echo "| Type : $CONTAINER_TYPE"
fi
- if [ -v CONTAINER_INSTANCE ]; then
- echo "| Instance : $CONTAINER_INSTANCE"
- fi
if [ -v CONTAINER_SERVICE ]; then
echo "| Service : $CONTAINER_SERVICE"
fi
+ if [ -v CONTAINER_INSTANCE ]; then
+ echo "| Instance : $CONTAINER_INSTANCE"
+ fi
echo "+====================================================="
}
diff --git a/Services/apache/README.md b/Services/apache/README.md
index 81afb68..48aa4a0 100644
--- a/Services/apache/README.md
+++ b/Services/apache/README.md
@@ -18,8 +18,8 @@ based on [startx/fedora container](https://hub.docker.com/r/startx/fedora)
## Available flavours
-* `:latest` : Fedora core 23 + Apache
-* `:fc23` : Fedora core 23 + Apache
+* `:latest` : Fedora core 23 + Apache 2.4.17
+* `:fc23` : Fedora core 23 + Apache 2.4.17
* `:fc22` : Fedora core 22 + Apache
* `:fc21` : Fedora core 21 + Apache
* `:centos7` : CentOS 7 + Apache
diff --git a/Services/apache/docker-compose.yml b/Services/apache/docker-compose.yml
index bb4617f..44c8a5b 100644
--- a/Services/apache/docker-compose.yml
+++ b/Services/apache/docker-compose.yml
@@ -6,8 +6,8 @@ server:
cpu_shares: 2
restart: "on-failure:2"
ports:
- - "80:80"
- - "443:443"
+ - "9201:80"
+ - "9202:443"
environment:
CONTAINER_TYPE: "service"
CONTAINER_SERVICE: "apache"
diff --git a/Services/apache/sx-httpd.sh b/Services/apache/sx-httpd.sh
index ec8c6bb..2b7581d 100644
--- a/Services/apache/sx-httpd.sh
+++ b/Services/apache/sx-httpd.sh
@@ -28,12 +28,12 @@ function display_container_httpd_header {
if [ -v CONTAINER_TYPE ]; then
echo "| Type : $CONTAINER_TYPE"
fi
- if [ -v CONTAINER_INSTANCE ]; then
- echo "| Instance : $CONTAINER_INSTANCE"
- fi
if [ -v CONTAINER_SERVICE ]; then
echo "| Service : $CONTAINER_SERVICE"
fi
+ if [ -v CONTAINER_INSTANCE ]; then
+ echo "| Instance : $CONTAINER_INSTANCE"
+ fi
if [ -v SERVER_NAME ]; then
echo "| ServerName : $SERVER_NAME"
fi
diff --git a/Services/mariadb/README.md b/Services/mariadb/README.md
index 1370d83..3e9733f 100644
--- a/Services/mariadb/README.md
+++ b/Services/mariadb/README.md
@@ -18,8 +18,8 @@ based on [startx/fedora container](https://hub.docker.com/r/startx/fedora)
## Available flavours
-* `:latest` : Fedora core 23 + MariaDB
-* `:fc23` : Fedora core 23 + MariaDB
+* `:latest` : Fedora core 23 + MariaDB 10.0.21 (compat mysql 15.1)
+* `:fc23` : Fedora core 23 + MariaDB 10.0.21 (compat mysql 15.1)
* `:fc22` : Fedora core 22 + MariaDB
* `:fc21` : Fedora core 21 + MariaDB
* `:centos7` : CentOS 7 + MariaDB
diff --git a/Services/mariadb/docker-compose.yml b/Services/mariadb/docker-compose.yml
index a42f575..29242d7 100644
--- a/Services/mariadb/docker-compose.yml
+++ b/Services/mariadb/docker-compose.yml
@@ -6,7 +6,7 @@ server:
cpu_shares: 8
restart: "on-failure:2"
ports:
- - "3306:3306"
+ - "9231:3306"
environment:
CONTAINER_TYPE: "service"
CONTAINER_SERVICE: "mariadb"
diff --git a/Services/mariadb/run.sh b/Services/mariadb/run.sh
index b8f8aed..d3bd4c1 100644
--- a/Services/mariadb/run.sh
+++ b/Services/mariadb/run.sh
@@ -21,12 +21,12 @@ function display_container_mariadb_header {
if [ -v CONTAINER_TYPE ]; then
echo "| Type : $CONTAINER_TYPE"
fi
- if [ -v CONTAINER_INSTANCE ]; then
- echo "| Instance : $CONTAINER_INSTANCE"
- fi
if [ -v CONTAINER_SERVICE ]; then
echo "| Service : $CONTAINER_SERVICE"
fi
+ if [ -v CONTAINER_INSTANCE ]; then
+ echo "| Instance : $CONTAINER_INSTANCE"
+ fi
if [ -v DATA_PATH ]; then
echo "| Data path : $DATA_PATH"
fi
@@ -65,11 +65,19 @@ function begin_config {
chmod 0774 $LOADSQL_PATH;
chown mysql:mysql $LOADSQL_PATH
fi
+ echo "" >> $MY_CONF
+ echo "[mysqld]" >> $MY_CONF
+ echo "datadir=$DATA_PATH" >> $MY_CONF
+ echo "log-error=$LOG_PATH/mysqld.log" >> $MY_CONF
+ echo "" >> $MY_CONF
+ echo "[mariadb]" >> $MY_CONF
+ echo "datadir=$DATA_PATH" >> $MY_CONF
+ echo "log-error=$LOG_PATH/mariadb.log" >> $MY_CONF
VOLUME_HOME=$DATA_PATH/mysql
if [[ ! -d $VOLUME_HOME ]]; then
echo "mariadb directory is empty or uninitialized"
echo "Installing MariaDB in $DATA_PATH ..."
- mysql_install_db > /dev/null 2>&1
+ mysql_install_db --datadir=$DATA_PATH --defaults-file=$MY_CONF --user=mysql > /dev/null 2>&1
chown mysql:mysql -R $DATA_PATH
echo "Installing MariaDB in $DATA_PATH is DONE !"
else
@@ -77,13 +85,6 @@ function begin_config {
echo "Reusing MariaDB in $DATA_PATH ..."
chown mysql:mysql -R $DATA_PATH
fi
- echo "" >> $MY_CONF
- echo "[mysqld]" >> $MY_CONF
- echo "datadir=$DATA_PATH" >> $MY_CONF
- echo "log-error=$LOG_PATH/mysqld.log" >> $MY_CONF
- echo "" >> $MY_CONF
- echo "[mariadb]" >> $MY_CONF
- echo "log-error=$LOG_PATH/mariadb.log" >> $MY_CONF
}
function config_startserver {
diff --git a/Services/memcache/README.md b/Services/memcache/README.md
index 101fd1f..724a662 100644
--- a/Services/memcache/README.md
+++ b/Services/memcache/README.md
@@ -18,12 +18,12 @@ based on [startx/fedora container](https://hub.docker.com/r/startx/fedora)
## Available flavours
-* `:latest` : Fedora core 23 + Memcached
-* `:fc23` : Fedora core 23 + Memcached
-* `:fc22` : Fedora core 22 + Memcached
-* `:fc21` : Fedora core 21 + Memcached
-* `:centos7` : CentOS 7 + Memcached
-* `:centos6` : Centos 6 + Memcached
+* `:latest` : Fedora core 23 + memcached 1.4.17
+* `:fc23` : Fedora core 23 + memcached 1.4.17
+* `:fc22` : Fedora core 22 + memcached
+* `:fc21` : Fedora core 21 + memcached
+* `:centos7` : CentOS 7 + memcached
+* `:centos6` : Centos 6 + memcached
## Running from dockerhub registry
diff --git a/Services/memcache/docker-compose.yml b/Services/memcache/docker-compose.yml
index b907088..a61086d 100644
--- a/Services/memcache/docker-compose.yml
+++ b/Services/memcache/docker-compose.yml
@@ -6,7 +6,7 @@ server:
cpu_shares: 2
restart: "on-failure:2"
ports:
- - "11211:11211"
+ - "9271:11211"
environment:
CONTAINER_TYPE: "service"
CONTAINER_SERVICE: "memcache"
diff --git a/Services/memcache/run.sh b/Services/memcache/run.sh
index 1d6a60f..77ef648 100644
--- a/Services/memcache/run.sh
+++ b/Services/memcache/run.sh
@@ -10,12 +10,12 @@ function display_container_memcache_header {
if [ -v CONTAINER_TYPE ]; then
echo "| Type : $CONTAINER_TYPE"
fi
- if [ -v CONTAINER_INSTANCE ]; then
- echo "| Instance : $CONTAINER_INSTANCE"
- fi
if [ -v CONTAINER_SERVICE ]; then
echo "| Service : $CONTAINER_SERVICE"
fi
+ if [ -v CONTAINER_INSTANCE ]; then
+ echo "| Instance : $CONTAINER_INSTANCE"
+ fi
if [ -v LOG_PATH ]; then
echo "| Log path : $LOG_PATH"
fi
diff --git a/Services/mongo/README.md b/Services/mongo/README.md
index 84bb553..14745b4 100644
--- a/Services/mongo/README.md
+++ b/Services/mongo/README.md
@@ -18,12 +18,12 @@ based on [startx/fedora container](https://hub.docker.com/r/startx/fedora)
## Available flavours
-* `:latest` : Fedora core 23 + Mongo
-* `:fc23` : Fedora core 23 + Mongo
-* `:fc22` : Fedora core 22 + Mongo
-* `:fc21` : Fedora core 21 + Mongo
-* `:centos7` : CentOS 7 + Mongo
-* `:centos6` : Centos 6 + Mongo
+* `:latest` : Fedora core 23 + MongoDB 3.0.7
+* `:fc23` : Fedora core 23 + MongoDB 3.0.7
+* `:fc22` : Fedora core 22 + MongoDB
+* `:fc21` : Fedora core 21 + MongoDB
+* `:centos7` : CentOS 7 + MongoDB
+* `:centos6` : Centos 6 + MongoDB
## Running from dockerhub registry
diff --git a/Services/mongo/docker-compose.yml b/Services/mongo/docker-compose.yml
index 6a76b66..881d75c 100644
--- a/Services/mongo/docker-compose.yml
+++ b/Services/mongo/docker-compose.yml
@@ -6,8 +6,8 @@ server:
cpu_shares: 10
restart: "on-failure:2"
ports:
- - "27017:27017"
- - "28017:28017"
+ - "9251:27017"
+ - "9252:28017"
environment:
CONTAINER_TYPE: "service"
CONTAINER_SERVICE: "mongo"
diff --git a/Services/mongo/run.sh b/Services/mongo/run.sh
index 60b82c8..598b716 100644
--- a/Services/mongo/run.sh
+++ b/Services/mongo/run.sh
@@ -21,12 +21,12 @@ function display_container_mongodb_header {
if [ -v CONTAINER_TYPE ]; then
echo "| Type : $CONTAINER_TYPE"
fi
- if [ -v CONTAINER_INSTANCE ]; then
- echo "| Instance : $CONTAINER_INSTANCE"
- fi
if [ -v CONTAINER_SERVICE ]; then
echo "| Service : $CONTAINER_SERVICE"
fi
+ if [ -v CONTAINER_INSTANCE ]; then
+ echo "| Instance : $CONTAINER_INSTANCE"
+ fi
if [ -v DATA_PATH ]; then
echo "| Data path : $DATA_PATH"
fi
diff --git a/Services/nodejs/README.md b/Services/nodejs/README.md
index 69a99d3..240b7b8 100644
--- a/Services/nodejs/README.md
+++ b/Services/nodejs/README.md
@@ -19,8 +19,8 @@ Could use various network protocol (like http, websocket, smtp, telnet) accordin
## Available flavours
-* `:latest` : Fedora core 23 + NodeJS
-* `:fc23` : Fedora core 23 + NodeJS
+* `:latest` : Fedora core 23 + NodeJS v0.10.36
+* `:fc23` : Fedora core 23 + NodeJS v0.10.36
* `:fc22` : Fedora core 22 + NodeJS
* `:fc21` : Fedora core 21 + NodeJS
* `:centos7` : CentOS 7 + NodeJS
diff --git a/Services/nodejs/docker-compose.yml b/Services/nodejs/docker-compose.yml
index 48774e0..2ae018b 100644
--- a/Services/nodejs/docker-compose.yml
+++ b/Services/nodejs/docker-compose.yml
@@ -6,7 +6,7 @@ server:
cpu_shares: 5
restart: "on-failure:2"
ports:
- - "8000:8000"
+ - "9221:8000"
environment:
CONTAINER_TYPE: "service"
CONTAINER_SERVICE: "nodejs"
diff --git a/Services/nodejs/run.sh b/Services/nodejs/run.sh
index 366446c..1bd6a50 100644
--- a/Services/nodejs/run.sh
+++ b/Services/nodejs/run.sh
@@ -22,12 +22,12 @@ function display_container_nodejs_header {
if [ -v CONTAINER_TYPE ]; then
echo "| Type : $CONTAINER_TYPE"
fi
- if [ -v CONTAINER_INSTANCE ]; then
- echo "| Instance : $CONTAINER_INSTANCE"
- fi
if [ -v CONTAINER_SERVICE ]; then
echo "| Service : $CONTAINER_SERVICE"
fi
+ if [ -v CONTAINER_INSTANCE ]; then
+ echo "| Instance : $CONTAINER_INSTANCE"
+ fi
if [ -v APP_PATH ]; then
echo "| App path : $APP_PATH"
fi
@@ -46,7 +46,7 @@ function begin_config {
FILE_LIST=$(find $TMP_APP_PATH -maxdepth 1 -mindepth 1 -printf "%f\n")
for FILE in $FILE_LIST; do
echo -n "adding $APP_PATH/$FILE"
- mv -f $TMP_APP_PATH/$FILE $APP_PATH/
+ cp -r $TMP_APP_PATH/$FILE $APP_PATH/
echo " DONE"
done
fi
diff --git a/Services/ooconv/README.md b/Services/ooconv/README.md
index 1f2a4d9..2220562 100644
--- a/Services/ooconv/README.md
+++ b/Services/ooconv/README.md
@@ -18,12 +18,12 @@ based on [startx/fedora container](https://hub.docker.com/r/startx/fedora)
## Available flavours
-* `:latest` : Fedora core 23 + OOConv
-* `:fc23` : Fedora core 23 + OOConv
-* `:fc22` : Fedora core 22 + OOConv
-* `:fc21` : Fedora core 21 + OOConv
-* `:centos7` : CentOS 7 + OOConv
-* `:centos6` : Centos 6 + OOConv
+* `:latest` : Fedora core 23 + unoconv 0.7 + LibreOffice 5.0.3.2
+* `:fc23` : Fedora core 23 + unoconv 0.7 + LibreOffice 5.0.3.2
+* `:fc22` : Fedora core 22 + unoconv
+* `:fc21` : Fedora core 21 + unoconv
+* `:centos7` : CentOS 7 + unoconv
+* `:centos6` : Centos 6 + unoconv
## Running from dockerhub registry
diff --git a/Services/ooconv/docker-compose.yml b/Services/ooconv/docker-compose.yml
index d151395..64c9f57 100644
--- a/Services/ooconv/docker-compose.yml
+++ b/Services/ooconv/docker-compose.yml
@@ -6,7 +6,7 @@ server:
cpu_shares: 8
restart: "on-failure:2"
ports:
- - "2002:2002"
+ - "9261:2002"
environment:
CONTAINER_TYPE: "service"
CONTAINER_SERVICE: "ooconv"
diff --git a/Services/ooconv/run.sh b/Services/ooconv/run.sh
index 5a94662..57b6241 100644
--- a/Services/ooconv/run.sh
+++ b/Services/ooconv/run.sh
@@ -11,12 +11,12 @@ function display_container_ooconv_header {
if [ -v CONTAINER_TYPE ]; then
echo "| Type : $CONTAINER_TYPE"
fi
- if [ -v CONTAINER_INSTANCE ]; then
- echo "| Instance : $CONTAINER_INSTANCE"
- fi
if [ -v CONTAINER_SERVICE ]; then
echo "| Service : $CONTAINER_SERVICE"
fi
+ if [ -v CONTAINER_INSTANCE ]; then
+ echo "| Instance : $CONTAINER_INSTANCE"
+ fi
if [ -v LOG_PATH ]; then
echo "| Log path : $LOG_PATH"
fi
@@ -27,7 +27,7 @@ function display_container_ooconv_header {
# Begin configuration before starting daemonized process
# and start generating host keys
function begin_config {
- echo "=> BEGIN MEMCACHE CONFIGURATION"
+ echo "=> BEGIN OOCONV CONFIGURATION"
if [[ ! -d $LOG_PATH ]]; then
echo "log directory $LOG_PATH not found"
mkdir -p $LOG_PATH;
@@ -40,7 +40,7 @@ function begin_config {
# End configuration process just before starting daemon
function end_config {
- echo "=> END MEMCACHE CONFIGURATION"
+ echo "=> END OOCONV CONFIGURATION"
}
# Start the ooconv server as a deamon and execute it inside
diff --git a/Services/php/README.md b/Services/php/README.md
index 79f3362..d0063b6 100644
--- a/Services/php/README.md
+++ b/Services/php/README.md
@@ -18,8 +18,8 @@ based on [startx/sv-apache container](https://hub.docker.com/r/startx/sv-apache)
## Available flavours
-* `:latest` : Fedora core 23 + Apache + PHP
-* `:fc23` : Fedora core 23 + Apache + PHP
+* `:latest` : Fedora core 23 + Apache 2.4.17 + PHP 5.6.16
+* `:fc23` : Fedora core 23 + Apache 2.4.17 + PHP 5.6.16
* `:fc22` : Fedora core 22 + Apache + PHP
* `:fc21` : Fedora core 21 + Apache + PHP
* `:centos7` : CentOS 7 + Apache + PHP
diff --git a/Services/php/docker-compose.yml b/Services/php/docker-compose.yml
index 1b6d62a..16a5496 100644
--- a/Services/php/docker-compose.yml
+++ b/Services/php/docker-compose.yml
@@ -6,8 +6,8 @@ server:
cpu_shares: 5
restart: "on-failure:2"
ports:
- - "80:80"
- - "443:443"
+ - "9213:80"
+ - "9214:443"
environment:
CONTAINER_TYPE: "service"
CONTAINER_SERVICE: "php"
diff --git a/Services/php/run.sh b/Services/php/run.sh
index e365b4e..a092c56 100644
--- a/Services/php/run.sh
+++ b/Services/php/run.sh
@@ -6,9 +6,46 @@ if [[ "$0" == *"run.sh" && ! $1 = "" ]];then
eval "$@";
fi
+function display_container_php_header {
+ echo "+====================================================="
+ echo "| Container : $HOSTNAME"
+ echo "| OS : $(</etc/redhat-release)"
+ echo "| HTTP engine : $(httpd -v | head -1)"
+ echo "| PHP engine : $(php --version | head -1)"
+ if [ -v CONTAINER_TYPE ]; then
+ echo "| Type : $CONTAINER_TYPE"
+ fi
+ if [ -v CONTAINER_SERVICE ]; then
+ echo "| Service : $CONTAINER_SERVICE"
+ fi
+ if [ -v CONTAINER_INSTANCE ]; then
+ echo "| Instance : $CONTAINER_INSTANCE"
+ fi
+ if [ -v SERVER_NAME ]; then
+ echo "| ServerName : $SERVER_NAME"
+ fi
+ if [ -v APP_PATH ]; then
+ echo "| App path : $APP_PATH"
+ fi
+ if [ -v LOG_PATH ]; then
+ echo "| Log path : $LOG_PATH"
+ fi
+ echo "+====================================================="
+}
+
+# Begin configuration before starting daemonized process
+# and start generating host keys
+function begin_php_config {
+ echo "=> BEGIN APACHE + PHP CONFIGURATION"
+}
+
+# End configuration process just before starting daemon
+function end_php_config {
+ echo "=> END APACHE + PHP CONFIGURATION"
+}
+
check_httpd_environment | tee -a $STARTUPLOG
-display_container_httpd_header | tee -a $STARTUPLOG
-begin_config | tee -a $STARTUPLOG
-end_config | tee -a $STARTUPLOG
-display_container_started | tee -a $STARTUPLOG
+display_container_php_header | tee -a $STARTUPLOG
+begin_php_config | tee -a $STARTUPLOG
+end_php_config | tee -a $STARTUPLOG
start_daemon
diff --git a/Services/postgres/Dockerfile b/Services/postgres/Dockerfile
index a8da28e..22e5761 100644
--- a/Services/postgres/Dockerfile
+++ b/Services/postgres/Dockerfile
@@ -15,7 +15,8 @@ RUN chmod 775 /bin/run.sh && \
mkdir -p $DATA_PATH && \
mkdir -p $LOG_PATH && \
touch $STARTUPLOG && \
- chown -R postgres:postgres $LOG_PATH $DATA_PATH $LOADSQL_PATH
+ chown -R postgres:postgres $LOG_PATH $DATA_PATH $LOADSQL_PATH $STARTUPLOG && \
+ chmod -R 0700 $DATA_PATH
EXPOSE 5432
VOLUME [$DATA_PATH,$LOG_PATH]
diff --git a/Services/postgres/README.md b/Services/postgres/README.md
index b190098..1051fe1 100644
--- a/Services/postgres/README.md
+++ b/Services/postgres/README.md
@@ -18,8 +18,8 @@ based on [startx/fedora container](https://hub.docker.com/r/startx/fedora)
## Available flavours
-* `:latest` : Fedora core 23 + PostgreSQL
-* `:fc23` : Fedora core 23 + PostgreSQL
+* `:latest` : Fedora core 23 + PostgreSQL 9.4.5
+* `:fc23` : Fedora core 23 + PostgreSQL 9.4.5
* `:fc22` : Fedora core 22 + PostgreSQL
* `:fc21` : Fedora core 21 + PostgreSQL
* `:centos7` : CentOS 7 + PostgreSQL
diff --git a/Services/postgres/docker-compose.yml b/Services/postgres/docker-compose.yml
index 26d502a..ac008c4 100644
--- a/Services/postgres/docker-compose.yml
+++ b/Services/postgres/docker-compose.yml
@@ -6,7 +6,7 @@ server:
cpu_shares: 8
restart: "on-failure:2"
ports:
- - "5432:5432"
+ - "9241:5432"
environment:
CONTAINER_TYPE: "service"
CONTAINER_SERVICE: "postgresql"
diff --git a/Services/postgres/run.sh b/Services/postgres/run.sh
index e5a70ec..ff4145d 100644
--- a/Services/postgres/run.sh
+++ b/Services/postgres/run.sh
@@ -21,12 +21,12 @@ function display_container_postgresql_header {
if [ -v CONTAINER_TYPE ]; then
echo "| Type : $CONTAINER_TYPE"
fi
- if [ -v CONTAINER_INSTANCE ]; then
- echo "| Instance : $CONTAINER_INSTANCE"
- fi
if [ -v CONTAINER_SERVICE ]; then
echo "| Service : $CONTAINER_SERVICE"
fi
+ if [ -v CONTAINER_INSTANCE ]; then
+ echo "| Instance : $CONTAINER_INSTANCE"
+ fi
if [ -v DATA_PATH ]; then
echo "| Data path : $DATA_PATH"
fi
diff --git a/docker-compose-app.yml b/docker-compose-app.yml
index 4c2dc3b..8f942d4 100644
--- a/docker-compose-app.yml
+++ b/docker-compose-app.yml
@@ -1,13 +1,7 @@
pma:
build: Applications/phpmyadmin/
container_name: "startx-app-phpmyadmin"
- ports:
- - "82:80"
- - "445:443"
rockmongo:
build: Applications/rockmongo/
- container_name: "startx-app-rockmongo"
- ports:
- - "83:80"
- - "446:443"
\ No newline at end of file
+ container_name: "startx-app-rockmongo"
\ No newline at end of file
diff --git a/docker-compose-sv.yml b/docker-compose-sv.yml
index 82ca13e..532ba9e 100644
--- a/docker-compose-sv.yml
+++ b/docker-compose-sv.yml
@@ -2,57 +2,38 @@ server_apache:
extends:
file: Services/apache/docker-compose.yml
service: server
- ports:
- - "80:80"
- - "443:443"
server_php:
extends:
file: Services/php/docker-compose.yml
service: server
- ports:
- - "81:80"
- - "444:443"
server_nodejs:
extends:
file: Services/nodejs/docker-compose.yml
service: server
- ports:
- - "82:8000"
server_mariadb:
extends:
file: Services/mariadb/docker-compose.yml
service: server
- ports:
- - "3306:3306"
server_postgres:
extends:
file: Services/postgres/docker-compose.yml
service: server
- ports:
- - "5432:5432"
server_mongo:
extends:
file: Services/mongo/docker-compose.yml
service: server
- ports:
- - "27017:27017"
- - "28017:28017"
server_ooconv:
extends:
file: Services/ooconv/docker-compose.yml
service: server
- ports:
- - "2002:2002"
server_memcache:
extends:
file: Services/memcache/docker-compose.yml
service: server
- ports:
- - "11211:11211"
diff --git a/docker-compose.yml b/docker-compose.yml
index 748381b..92c9cc4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,71 +7,46 @@ server_apache:
extends:
file: Services/apache/docker-compose.yml
service: server
- ports:
- - "80:80"
- - "443:443"
server_php:
extends:
file: Services/php/docker-compose.yml
service: server
- ports:
- - "81:80"
- - "444:443"
server_nodejs:
extends:
file: Services/nodejs/docker-compose.yml
service: server
- ports:
- - "82:8000"
server_mariadb:
extends:
file: Services/mariadb/docker-compose.yml
service: server
- ports:
- - "3306:3306"
server_postgres:
extends:
file: Services/postgres/docker-compose.yml
service: server
- ports:
- - "5432:5432"
server_mongo:
extends:
file: Services/mongo/docker-compose.yml
service: server
- ports:
- - "27017:27017"
- - "28017:28017"
server_ooconv:
extends:
file: Services/ooconv/docker-compose.yml
service: server
- ports:
- - "2002:2002"
server_memcache:
extends:
file: Services/memcache/docker-compose.yml
service: server
- ports:
- - "11211:11211"
#pma:
# build: Applications/phpmyadmin/
# container_name: "startx-app-phpmyadmin"
-# ports:
-# - "82:80"
-# - "445:443"
#
#rockmongo:
# build: Applications/rockmongo/
-# container_name: "startx-app-rockmongo"
-# ports:
-# - "83:80"
-# - "446:443"
\ No newline at end of file
+# container_name: "startx-app-rockmongo"
\ No newline at end of file
--
cgit v1.2.3