From 78d1d5017e8acbc8b4bb7f0f567d10f0e47a75df Mon Sep 17 00:00:00 2001
From: startxfr <clarue@startx.fr>
Date: Sun, 29 Nov 2015 00:44:42 +0100
Subject: rewrite mongo and small updates in others
---
Services/mariadb/docker-compose.yml | 6 +++---
Services/mariadb/run.sh | 10 +++++-----
2 files changed, 8 insertions(+), 8 deletions(-)
(limited to 'Services/mariadb')
diff --git a/Services/mariadb/docker-compose.yml b/Services/mariadb/docker-compose.yml
index 744b067..841d699 100644
--- a/Services/mariadb/docker-compose.yml
+++ b/Services/mariadb/docker-compose.yml
@@ -3,8 +3,8 @@ server:
# image: sx-mariadb
container_name: "sx-mariadb"
mem_limit: 1g
- memswap_limit: 2g
- cpu_shares: 2
+ memswap_limit: 1g
+ cpu_shares: 8
restart: "on-failure:2"
environment:
CONTAINER_TYPE: "service"
@@ -15,5 +15,5 @@ server:
MYSQL_PASSWORD: "pwd-test"
MYSQL_DATABASE: "db_test"
volumes:
- - "/tmp/container/logs:/data/logs"
+ - "/tmp/container/logs/mariadb:/data/logs/mariadb"
- "/tmp/container/mariadb:/data/mariadb"
\ No newline at end of file
diff --git a/Services/mariadb/run.sh b/Services/mariadb/run.sh
index 22f5f2a..c5ce811 100644
--- a/Services/mariadb/run.sh
+++ b/Services/mariadb/run.sh
@@ -3,9 +3,9 @@ source /bin/sx-lib.sh
function check_mariadb_environment {
check_environment
- if [ ! -v APP_PATH ]; then
- APP_PATH="/data/mariadb"
- export APP_PATH
+ if [ ! -v DATA_PATH ]; then
+ DATA_PATH="/data/mariadb"
+ export DATA_PATH
fi
if [ ! -v LOG_PATH ]; then
LOG_PATH="/data/logs/mariadb"
@@ -17,7 +17,7 @@ function display_container_mariadb_header {
echo "+====================================================="
echo "| Container : $HOSTNAME"
echo "| OS : $(</etc/redhat-release)"
- echo "| Engine : $(mysql -V)"
+ echo "| Engine : $(mysql -V | head -1)"
if [ -v CONTAINER_TYPE ]; then
echo "| Type : $CONTAINER_TYPE"
fi
@@ -27,7 +27,7 @@ function display_container_mariadb_header {
if [ -v CONTAINER_SERVICE ]; then
echo "| Service : $CONTAINER_SERVICE"
fi
- if [ -v APP_PATH ]; then
+ if [ -v DATA_PATH ]; then
echo "| Data path : $DATA_PATH"
fi
if [ -v LOG_PATH ]; then
--
cgit v1.2.3