summaryrefslogtreecommitdiffstats
path: root/Services/ooconv
diff options
context:
space:
mode:
authorstartxfr <clarue@startx.fr>2015-12-06 03:44:47 +0100
committerstartxfr <clarue@startx.fr>2015-12-06 03:44:47 +0100
commit1af7a22460dafe12f22f9b564d946f3d583f4cb0 (patch)
tree3d13d49ba4f5d6ac8cb4532435898b911bdf5a02 /Services/ooconv
parentb502829a772adb36d4786db369aa4d803eb7877c (diff)
downloadphpmyadmin-1af7a22460dafe12f22f9b564d946f3d583f4cb0.tar.gz
phpmyadmin-1af7a22460dafe12f22f9b564d946f3d583f4cb0.tar.bz2
phpmyadmin-1af7a22460dafe12f22f9b564d946f3d583f4cb0.tar.xz
phpmyadmin-1af7a22460dafe12f22f9b564d946f3d583f4cb0.zip
debuging images and improve startup display
Diffstat (limited to 'Services/ooconv')
-rw-r--r--Services/ooconv/README.md12
-rw-r--r--Services/ooconv/docker-compose.yml2
-rw-r--r--Services/ooconv/run.sh10
3 files changed, 12 insertions, 12 deletions
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