Commit 9893957ac38dd04098f6f08f965b797afa0316b5

Authored by Олександр Басенко
Exists in master

Merge branch 'master' of git.foss.com.ua:webportal/compose

Showing 2 changed files Side-by-side Diff

... ... @@ -2,10 +2,16 @@
2 2  
3 3 export COMPANY="foss"
4 4  
5   -function write_data()
  5 +export ODOO_REPO="odoo_repo_"$COMPANY""
  6 +export ODOO_LIB="odoo_lib_"$COMPANY""
  7 +export ODOO_ETC="odoo_etc_"$COMPANY""
  8 +export ODOO_BACKUP="odoo_backup_"$COMPANY""
  9 +export POSTGRES_PGDATA="postgres_pgdata_"$COMPANY""
  10 +
  11 +function clone_data()
6 12 {
7   - if [ -f data/"$1".tar.gz ]; then
8   - docker run -it --rm -v "$1":/webportal -v $(pwd)/data:/backup busybox tar zxvf /backup/"$1".tar.gz -C /webportal
  13 + if [ "$1" = $ODOO_REPO ]; then
  14 + docker run -it --rm -v "$1":/webportal -w /webportal 2bas/repo /bin/bash "-c" "git clone --progress --branch online_service -v --depth 1 git@git.foss.com.ua:fossdoc/webportal.git .; exit;";
9 15 fi
10 16 }
11 17  
12 18  
13 19  
... ... @@ -14,16 +20,16 @@
14 20 IS_EXIST_VOLUME="$(docker volume ls -q -f name="^${1}$")"
15 21  
16 22 if [ -z "${IS_EXIST_VOLUME}" ];then
17   - echo "create volume: ${1}"
18   - docker volume create --name "$1"
19   - write_data "$1"
  23 + echo "create volume: ${1}";
  24 + docker volume create --name "$1";
  25 + clone_data "$1";
20 26 else
21 27 while true; do
22   - read -p "Volume ${1} already exist. Overwrite (no\yes)?" ny
  28 + read -p "Volume ${1} already exist. Overwrite (no|yes)?" ny
23 29 case $ny in
24 30 [Yy]* ) docker volume rm "$1";
25 31 docker volume create --name "$1";
26   - write_data "$1"
  32 + clone_data "$1";
27 33 break;;
28 34 [Nn]* ) break;;
29 35 * ) echo "Please answer yes or no.";;
30 36  
... ... @@ -32,14 +38,7 @@
32 38 fi
33 39 }
34 40  
35   -export ODOO_REPO="odoo_repo_"$COMPANY""
36   -export ODOO_LIB="odoo_lib_"$COMPANY""
37   -export ODOO_ETC="odoo_etc_"$COMPANY""
38   -export ODOO_BACKUP="odoo_backup_"$COMPANY""
39   -export POSTGRES_PGDATA="postgres_pgdata_"$COMPANY""
40   -
41 41 create_volume $ODOO_REPO
42   -
43 42 docker run -it --rm -v "$ODOO_REPO":/webportal -w /webportal 2bas/repo /bin/bash "-c" "git pull; exit;"
44 43  
45 44 create_volume $ODOO_LIB
odoo/openerp-server.conf
... ... @@ -23,8 +23,8 @@
23 23 list_db = True
24 24 log_db = False
25 25 log_db_level = warning
26   -log_handler = :DEBUG
27   -log_level = info
  26 +log_handler = :WARNING
  27 +log_level = warning
28 28 logfile = /var/log/odoo/odoo.log
29 29 logrotate = False
30 30 longpolling_port = 8072