From 382796cbdf9db13ba19468ffb319bdb2c2d1d378 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Robson=20Le=C3=A3o?= Date: Mon, 8 Jun 2020 22:58:24 -0300 Subject: [PATCH 01/11] features: docker-compose version * include docker-compose file * change config.ini to environment variable * entrypoint.sh settings --- Dockerfile | 37 +++++++++++++++------ README.md | 49 ++++++++++++++++++++++++++++ build | 1 - config.ini | 40 ----------------------- docker-compose.yml | 57 ++++++++++++++++++++++++++++++++ entrypoint.sh | 81 ++++++++++++++++++++++++++++++++++++++++++++++ run | 6 ---- 7 files changed, 215 insertions(+), 56 deletions(-) delete mode 100644 build delete mode 100644 config.ini create mode 100644 docker-compose.yml create mode 100755 entrypoint.sh delete mode 100755 run diff --git a/Dockerfile b/Dockerfile index 48abca1..5777da3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,32 @@ -FROM node:8 +FROM node:8-alpine -RUN apt-get update && \ - apt-get install -y mysql-client-5.5 curl unzip && \ - apt-get clean +LABEL maintainer Pedro Robson Leão -RUN wget https://github.com/ipoddubny/webcdr/archive/master.zip -O /tmp/webcdr.zip && unzip /tmp/webcdr.zip -d /tmp - -WORKDIR /tmp/webcdr-master +RUN wget https://github.com/ipoddubny/webcdr/archive/master.zip -O /tmp/webcdr.zip && unzip /tmp/webcdr.zip -d /opt -RUN npm -g install bower browserify && cd public/ && bower install --allow-root && cd .. && npm install && npm run build +ENV APP_HOME=/opt/webcdr-master +ENV ENTRYPOINT=./entrypoint.sh -CMD node /tmp/webcdr-master/server.js +WORKDIR ${APP_HOME} + +RUN apk add --no-cache \ + mysql-client \ + git \ + python3 \ + make && \ + npm -g install \ + bower \ + browserify && \ + cd public/ && \ + bower install --allow-root && \ + cd .. && \ + npm install && \ + npm run build + +ADD ${ENTRYPOINT} ${APP_HOME}/ + +EXPOSE 9030 + +CMD chmod 755 ${APP_HOME}/entrypoint.sh + +ENTRYPOINT [ "sh","/opt/webcdr-master/entrypoint.sh" ] diff --git a/README.md b/README.md index b4e7ffb..f0b20f9 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,51 @@ # docker-webcdr + Build and running webcdr in Docker + + +## build image + +`docker build -t pedrorobsonleao/webcdr .` + +## run image + +```bash +docker run \ + --name webcdr \ + --publish 9030:9030 \ + --env TZ=America/Sao_Paulo \ + --env DB_CLIENT=mysql \ + --env DB_CONNECTION_HOST=db \ + --env DB_CONNECTION_USER=cdrdb \ + --env DB_CONNECTION_PASSWORD=cdrpwd \ + --env DB_CONNECTION_DATABASE=asteriskcdrdb \ + --env DB_CONNECTION_CHARSET=utf8 \ + --env CDR_TABLE=cdr \ + --env SESSION_KEY=123hjhfds7&&&kjfh&&&788 \ + --env AUTH_AD_DOMAIN=exemple \ + --env AUTH_AD_CONNECTION_URL=ldap://server.ip.address \ + --env AUTH_AD_CONNECTION_BASEDN=dc=example,dc=org \ + --env AUTH_AD_CONNECTION_USERNAME=cdruser@example.org \ + --env AUTH_AD_CONNECTION_PASSWORD=cdruser_ad_password \ + --detach \ + pedrorobsonleao/webcr +``` + +## docker-compose + +This version up all insfrastructure with [mysql:5](https://hub.docker.com/_/mysql) amd [node:8-alpine](https://hub.docker.com/_/node/). + +`docker-compose up --detach` + +## how to use + +http://localhost:9030 + +|user|passwort| +|-|-| +|admin|admincdr| + +## references + +* [ipoddubny/webcdr](https://github.com/ipoddubny/webcdr) +* [mifistor/docker-webcdr](https://github.com/mifistor/docker-webcdr) \ No newline at end of file diff --git a/build b/build deleted file mode 100644 index 673472c..0000000 --- a/build +++ /dev/null @@ -1 +0,0 @@ -docker build -t mifistor/webcdr . diff --git a/config.ini b/config.ini deleted file mode 100644 index 6da7b42..0000000 --- a/config.ini +++ /dev/null @@ -1,40 +0,0 @@ -;base timezone, valid values: -; - UTC offset: +0100, -0500 -; - time zone: UTC, US/Pacific, Europe/Brussels -tz=Europe/Moscow - -; database connection settings -[db] -client = mysql - -[db.connection] -host = localhost -user = root -password = -database = asteriskcdrdb -charset=utf8 - -; cdr table name in the database -[cdr] -table = cdr -; idAttribute = id ; primary key in cdr table, default is "id" - -; web session storage parameters -[session] -key = 123hjhfds7&&&kjfh&&&788 - -[web] -; urlPrefix = ; empty by default, set if running webcdr behind a proxying web server like nginx - -[recordings] -pattern = /var/spool/asterisk/monitor/%YYYY%/%MM%/%DD%/*%uniqueid%.wav - -[auth.ad] -domain = example - -[auth.ad.connection] -url = ldap://server.ip.address -baseDN = dc=example,dc=org -username = cdruser@example.org -password = cdruser_ad_password - diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..31c14cc --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,57 @@ +version: '3.3' + +networks: + cdr_net: + driver: bridge + +services: + db: + # image: nimmis/alpine-mariadb + image: mysql:5 + # container_name: mariadb + container_name: mysql + environment: + - MYSQL_ROOT_PASSWORD=pwdroot + - MYSQL_DATABASE=asteriskcdrdb + - MYSQL_USER=cdrdb + - MYSQL_PASSWORD=cdrpwd + ports: + - '13306:3306' + volumes: + - webcdr_db_data:/data + restart: always + networks: + - 'cdr_net' + + cdr: + build: . + container_name: webcdr + environment: + - TZ=America/Sao_Paulo + - DB_CLIENT=mysql + - DB_CONNECTION_HOST=db + - DB_CONNECTION_USER=cdrdb + - DB_CONNECTION_PASSWORD=cdrpwd + - DB_CONNECTION_DATABASE=asteriskcdrdb + - DB_CONNECTION_CHARSET=utf8 + - CDR_TABLE=cdr + - SESSION_KEY=123hjhfds7&&&kjfh&&&788 + - AUTH_AD_DOMAIN=exemple + - AUTH_AD_CONNECTION_URL=ldap://server.ip.address + - AUTH_AD_CONNECTION_BASEDN=dc=example,dc=org + - AUTH_AD_CONNECTION_USERNAME=cdruser@example.org + - AUTH_AD_CONNECTION_PASSWORD=cdruser_ad_password + ports: + - '9030:9030' + volumes: + - webcdr_web_data:/var/spool/asterisk/monitor + depends_on: + - db + restart: always + networks: + - 'cdr_net' + +volumes: + webcdr_db_data: + webcdr_web_data: + \ No newline at end of file diff --git a/entrypoint.sh b/entrypoint.sh new file mode 100755 index 0000000..4164d92 --- /dev/null +++ b/entrypoint.sh @@ -0,0 +1,81 @@ +#!/usr/bin/sh -xv + +APP_HOME="/opt/webcdr-master"; + +cat >> ${APP_HOME}/config.ini < Date: Tue, 9 Jun 2020 22:51:32 -0300 Subject: [PATCH 02/11] fix: image optimizations * reduce layers --- Dockerfile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5777da3..909b932 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,14 +2,13 @@ FROM node:8-alpine LABEL maintainer Pedro Robson Leão -RUN wget https://github.com/ipoddubny/webcdr/archive/master.zip -O /tmp/webcdr.zip && unzip /tmp/webcdr.zip -d /opt - ENV APP_HOME=/opt/webcdr-master ENV ENTRYPOINT=./entrypoint.sh -WORKDIR ${APP_HOME} -RUN apk add --no-cache \ +RUN wget https://github.com/ipoddubny/webcdr/archive/master.zip -O /tmp/webcdr.zip && unzip /tmp/webcdr.zip -d /opt && \ + cd /opt/webcdr-master && \ + apk add --no-cache \ mysql-client \ git \ python3 \ @@ -21,7 +20,10 @@ RUN apk add --no-cache \ bower install --allow-root && \ cd .. && \ npm install && \ - npm run build + npm run build && \ + apk del git python3 make + +WORKDIR ${APP_HOME} ADD ${ENTRYPOINT} ${APP_HOME}/ From 5050db57be62baba11dc7d6e70cb841af94844e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Robson=20Le=C3=A3o?= Date: Tue, 9 Jun 2020 23:05:11 -0300 Subject: [PATCH 03/11] fix: remove comments --- docker-compose.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 31c14cc..72ffae4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,9 +6,7 @@ networks: services: db: - # image: nimmis/alpine-mariadb image: mysql:5 - # container_name: mariadb container_name: mysql environment: - MYSQL_ROOT_PASSWORD=pwdroot From c95fd3c65a1304e23bd18d9c829e01a7ac088cbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Robson=20Le=C3=A3o?= Date: Sun, 14 Jun 2020 12:19:00 -0300 Subject: [PATCH 04/11] fix: settings * builds.sh --- Dockerfile | 4 +--- build.sh | 14 ++++++++++++++ docker-compose.yml | 43 ++++++++++++++++++++++++++++++++++--------- entrypoint.sh | 10 +++++++++- 4 files changed, 58 insertions(+), 13 deletions(-) create mode 100755 build.sh diff --git a/Dockerfile b/Dockerfile index 909b932..8178d52 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,6 +29,4 @@ ADD ${ENTRYPOINT} ${APP_HOME}/ EXPOSE 9030 -CMD chmod 755 ${APP_HOME}/entrypoint.sh - -ENTRYPOINT [ "sh","/opt/webcdr-master/entrypoint.sh" ] +ENTRYPOINT [ "./entrypoint.sh" ] diff --git a/build.sh b/build.sh new file mode 100755 index 0000000..8091917 --- /dev/null +++ b/build.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +VERSION=${VERSION:-0.9.0-alpine} + +[ "${1}" == "--build" ] && { + toClean=$(docker images | egrep "${USER}/${PWD##*/}|none" | awk '{ print $3 }'); + + [ ! -z "${toClean}" ] && { + docker rmi ${toClean}; + } +} + +time docker build -t ${USER}/${PWD##*/} . && \ +time docker build -t ${USER}/${PWD##*/}:${VERSION} . diff --git a/docker-compose.yml b/docker-compose.yml index 72ffae4..c4239e9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.3' networks: - cdr_net: + pabx_net: driver: bridge services: @@ -16,13 +16,14 @@ services: ports: - '13306:3306' volumes: - - webcdr_db_data:/data + - pabx_db_data:/data restart: always networks: - - 'cdr_net' + - 'pabx_net' cdr: - build: . + image: pedroleao/webcdr:0.9.0-alpine + # build: . container_name: webcdr environment: - TZ=America/Sao_Paulo @@ -41,15 +42,39 @@ services: - AUTH_AD_CONNECTION_PASSWORD=cdruser_ad_password ports: - '9030:9030' + entrypoint: + - './entrypoint.sh' volumes: - - webcdr_web_data:/var/spool/asterisk/monitor + - pabx_web_data:/var/spool/asterisk/monitor depends_on: - db restart: always networks: - - 'cdr_net' + - 'pabx_net' + + # pabx: + # image: pedroleao/asterisk:16.11 + # container_name: pabx + # entrypoint: + # - DB_CONNECTION_HOST=db + # - DB_CONNECTION_USER=cdrdb + # - DB_CONNECTION_PASSWORD=cdrpwd + # - DB_CONNECTION_DATABASE=asteriskcdrdb + # - ACL=192.168.0.0\\/24 + # ports: + # - '5060:5060' + # entrypoint: + # - './entrypoint.sh' + # # mapear logs e gravações + # # volumes: + # # - + # depends_on: + # - cdr + # restart: always + # networks: + # - 'pabx_net' volumes: - webcdr_db_data: - webcdr_web_data: - \ No newline at end of file + pabx_db_data: + pabx_web_data: + diff --git a/entrypoint.sh b/entrypoint.sh index 4164d92..ca798fc 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,4 +1,4 @@ -#!/usr/bin/sh -xv +#!/bin/sh APP_HOME="/opt/webcdr-master"; @@ -66,6 +66,14 @@ function _start() { } function main() { + + [ ! -z "$@" ] && { + ${@} + return $? + } + + [ -z "${DB_CONNECTION_HOST}" ] && return 1; + local i=0 while [ $i -lt 30 ]; do i=$((i+1)); From 7b9a7399457ae64c8357d73d7da146cc88a2e48f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Robson=20Le=C3=A3o?= Date: Sun, 14 Jun 2020 13:46:31 -0300 Subject: [PATCH 05/11] fix: entrypoint message --- entrypoint.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index ca798fc..af856b1 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -59,7 +59,9 @@ function _start() { } cd ${APP_HOME} && { - cat config.ini + cat config.ini + + echo ":: open for the business !"; node ./server.js } } @@ -78,10 +80,9 @@ function main() { while [ $i -lt 30 ]; do i=$((i+1)); nc -zv ${DB_CONNECTION_HOST} 3306 && { - echo ":: open for the business !"; _start; } - sleep 10; + sleep 20; echo ":: waiting db in ${DB_CONNECTION_HOST}/${DB_CONNECTION_DATABASE} retry ${i}..."; done } From 6c3e2d87101a06adb9206ab23d444fca313bdcf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Robson=20Le=C3=A3o?= Date: Mon, 15 Jun 2020 10:54:05 -0300 Subject: [PATCH 06/11] fix: docker-compose --- .env | 1 + docker-compose.yml | 126 ++++++++++++++++++--------------------------- 2 files changed, 50 insertions(+), 77 deletions(-) create mode 100644 .env diff --git a/.env b/.env new file mode 100644 index 0000000..dce3e09 --- /dev/null +++ b/.env @@ -0,0 +1 @@ +COMPOSE_PROJECT_NAME=webcdr \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index c4239e9..49a2aa1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,80 +1,52 @@ version: '3.3' - -networks: - pabx_net: - driver: bridge - +networks: + pabx_net: + driver: bridge services: - db: - image: mysql:5 - container_name: mysql - environment: - - MYSQL_ROOT_PASSWORD=pwdroot - - MYSQL_DATABASE=asteriskcdrdb - - MYSQL_USER=cdrdb - - MYSQL_PASSWORD=cdrpwd - ports: - - '13306:3306' - volumes: - - pabx_db_data:/data - restart: always - networks: - - 'pabx_net' - - cdr: - image: pedroleao/webcdr:0.9.0-alpine - # build: . - container_name: webcdr - environment: - - TZ=America/Sao_Paulo - - DB_CLIENT=mysql - - DB_CONNECTION_HOST=db - - DB_CONNECTION_USER=cdrdb - - DB_CONNECTION_PASSWORD=cdrpwd - - DB_CONNECTION_DATABASE=asteriskcdrdb - - DB_CONNECTION_CHARSET=utf8 - - CDR_TABLE=cdr - - SESSION_KEY=123hjhfds7&&&kjfh&&&788 - - AUTH_AD_DOMAIN=exemple - - AUTH_AD_CONNECTION_URL=ldap://server.ip.address - - AUTH_AD_CONNECTION_BASEDN=dc=example,dc=org - - AUTH_AD_CONNECTION_USERNAME=cdruser@example.org - - AUTH_AD_CONNECTION_PASSWORD=cdruser_ad_password - ports: - - '9030:9030' - entrypoint: - - './entrypoint.sh' - volumes: - - pabx_web_data:/var/spool/asterisk/monitor - depends_on: - - db - restart: always - networks: - - 'pabx_net' - - # pabx: - # image: pedroleao/asterisk:16.11 - # container_name: pabx - # entrypoint: - # - DB_CONNECTION_HOST=db - # - DB_CONNECTION_USER=cdrdb - # - DB_CONNECTION_PASSWORD=cdrpwd - # - DB_CONNECTION_DATABASE=asteriskcdrdb - # - ACL=192.168.0.0\\/24 - # ports: - # - '5060:5060' - # entrypoint: - # - './entrypoint.sh' - # # mapear logs e gravações - # # volumes: - # # - - # depends_on: - # - cdr - # restart: always - # networks: - # - 'pabx_net' - + db: + image: 'mysql:5' + container_name: mysql + environment: + - MYSQL_ROOT_PASSWORD=pwdroot + - MYSQL_DATABASE=asteriskcdrdb + - MYSQL_USER=cdrdb + - MYSQL_PASSWORD=cdrpwd + ports: + - '13306:3306' + volumes: + - 'pabx_db_data:/data' + restart: always + networks: + - pabx_net + cdr: + image: 'pedroleao/webcdr:0.9.0-alpine' + container_name: webcdr + environment: + - TZ=America/Sao_Paulo + - DB_CLIENT=mysql + - DB_CONNECTION_HOST=db + - DB_CONNECTION_USER=cdrdb + - DB_CONNECTION_PASSWORD=cdrpwd + - DB_CONNECTION_DATABASE=asteriskcdrdb + - DB_CONNECTION_CHARSET=utf8 + - CDR_TABLE=cdr + - SESSION_KEY=123hjhfds7&&&kjfh&&&788 + - AUTH_AD_DOMAIN=exemple + - 'AUTH_AD_CONNECTION_URL=ldap://server.ip.address' + - 'AUTH_AD_CONNECTION_BASEDN=dc=example,dc=org' + - AUTH_AD_CONNECTION_USERNAME=cdruser@example.org + - AUTH_AD_CONNECTION_PASSWORD=cdruser_ad_password + ports: + - '9030:9030' + entrypoint: + - ./entrypoint.sh + volumes: + - 'pabx_web_data:/var/spool/asterisk/monitor' + depends_on: + - db + restart: always + networks: + - pabx_net volumes: - pabx_db_data: - pabx_web_data: - + pabx_db_data: null + pabx_web_data: null From 91c7b8817bf643168809fd19710762d96b3cd60f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Robson=20Le=C3=A3o?= Date: Mon, 15 Jun 2020 11:32:12 -0300 Subject: [PATCH 07/11] fix: entrypoint remove --- docker-compose.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 49a2aa1..9f985f1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -38,8 +38,6 @@ services: - AUTH_AD_CONNECTION_PASSWORD=cdruser_ad_password ports: - '9030:9030' - entrypoint: - - ./entrypoint.sh volumes: - 'pabx_web_data:/var/spool/asterisk/monitor' depends_on: From b8823825515c76520fb2be20f6280b2d8ff20f9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Robson=20Le=C3=A3o?= Date: Mon, 15 Jun 2020 11:46:50 -0300 Subject: [PATCH 08/11] fix: change image name * correctly image name --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 9f985f1..c68dfc5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,7 +19,7 @@ services: networks: - pabx_net cdr: - image: 'pedroleao/webcdr:0.9.0-alpine' + image: 'pedrorobsonleao/webcdr:0.9.0-alpine' container_name: webcdr environment: - TZ=America/Sao_Paulo From f04cc28f90c9ee4b8b38303be076a6d9e402f8bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Robson=20Le=C3=A3o?= Date: Wed, 17 Jun 2020 14:02:15 -0300 Subject: [PATCH 09/11] fix: flagto initialize db --- README.md | 1 + docker-compose.yml | 1 + entrypoint.sh | 30 ++++++++++++++++-------------- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index f0b20f9..120dde3 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,7 @@ docker run \ --env DB_CONNECTION_PASSWORD=cdrpwd \ --env DB_CONNECTION_DATABASE=asteriskcdrdb \ --env DB_CONNECTION_CHARSET=utf8 \ + --env DB_INIT=true \ --env CDR_TABLE=cdr \ --env SESSION_KEY=123hjhfds7&&&kjfh&&&788 \ --env AUTH_AD_DOMAIN=exemple \ diff --git a/docker-compose.yml b/docker-compose.yml index c68dfc5..28d21e7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -29,6 +29,7 @@ services: - DB_CONNECTION_PASSWORD=cdrpwd - DB_CONNECTION_DATABASE=asteriskcdrdb - DB_CONNECTION_CHARSET=utf8 + - DB_INIT=true - CDR_TABLE=cdr - SESSION_KEY=123hjhfds7&&&kjfh&&&788 - AUTH_AD_DOMAIN=exemple diff --git a/entrypoint.sh b/entrypoint.sh index af856b1..f416798 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -49,20 +49,22 @@ function _start() { [ -d ${APP_HOME} ] && { - local SQLFILE="${APP_HOME}/install/db.sql"; - - [ -f ${SQLFILE} ] && { - set -xv; - mysql ${DB_CONNECTION_DATABASE} -u${DB_CONNECTION_USER} -p${DB_CONNECTION_PASSWORD} -h${DB_CONNECTION_HOST} < $SQLFILE && \ - mv ${SQLFILE} ${SQLFILE//.sql/}.$(date -I).sql; - set +xv; - } - - cd ${APP_HOME} && { - cat config.ini - - echo ":: open for the business !"; - node ./server.js + [ ${DB_INIT^^} == "TRUE" ] && { + local SQLFILE="${APP_HOME}/install/db.sql"; + + [ -f ${SQLFILE} ] && { + set -xv; + mysql ${DB_CONNECTION_DATABASE} -u${DB_CONNECTION_USER} -p${DB_CONNECTION_PASSWORD} -h${DB_CONNECTION_HOST} < $SQLFILE && \ + mv ${SQLFILE} ${SQLFILE//.sql/}.$(date -I).sql; + set +xv; + } + + cd ${APP_HOME} && { + cat config.ini + + echo ":: open for the business !"; + node ./server.js + } } } } From 659a2ee8fdb97e513f33394e770a3ad7cff011c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Robson=20Le=C3=A3o?= Date: Wed, 17 Jun 2020 23:02:21 -0300 Subject: [PATCH 10/11] fix: load db config --- README.md | 4 ++-- docker-compose.yml | 2 +- entrypoint.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 120dde3..02377ef 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ docker run \ --env DB_CONNECTION_PASSWORD=cdrpwd \ --env DB_CONNECTION_DATABASE=asteriskcdrdb \ --env DB_CONNECTION_CHARSET=utf8 \ - --env DB_INIT=true \ + --env DB_INIT=TRU \ --env CDR_TABLE=cdr \ --env SESSION_KEY=123hjhfds7&&&kjfh&&&788 \ --env AUTH_AD_DOMAIN=exemple \ @@ -49,4 +49,4 @@ http://localhost:9030 ## references * [ipoddubny/webcdr](https://github.com/ipoddubny/webcdr) -* [mifistor/docker-webcdr](https://github.com/mifistor/docker-webcdr) \ No newline at end of file +* [mifistor/docker-webcdr](https://github.com/mifistor/docker-webcdr) diff --git a/docker-compose.yml b/docker-compose.yml index 28d21e7..93129a3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -29,7 +29,7 @@ services: - DB_CONNECTION_PASSWORD=cdrpwd - DB_CONNECTION_DATABASE=asteriskcdrdb - DB_CONNECTION_CHARSET=utf8 - - DB_INIT=true + - DB_INIT=TRUE - CDR_TABLE=cdr - SESSION_KEY=123hjhfds7&&&kjfh&&&788 - AUTH_AD_DOMAIN=exemple diff --git a/entrypoint.sh b/entrypoint.sh index f416798..75bf2a2 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -49,7 +49,7 @@ function _start() { [ -d ${APP_HOME} ] && { - [ ${DB_INIT^^} == "TRUE" ] && { + [ ${DB_INIT} == "TRUE" ] && { local SQLFILE="${APP_HOME}/install/db.sql"; [ -f ${SQLFILE} ] && { @@ -89,4 +89,4 @@ function main() { done } -main $@; \ No newline at end of file +main $@; From ef1c6319e03da735aa650e54c3a9e90d49c29614 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Robson=20Le=C3=A3o?= Date: Wed, 17 Jun 2020 23:09:03 -0300 Subject: [PATCH 11/11] fix: db load --- entrypoint.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index 75bf2a2..af609a5 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -58,13 +58,13 @@ function _start() { mv ${SQLFILE} ${SQLFILE//.sql/}.$(date -I).sql; set +xv; } + } - cd ${APP_HOME} && { - cat config.ini + cd ${APP_HOME} && { + cat config.ini - echo ":: open for the business !"; - node ./server.js - } + echo ":: open for the business !"; + node ./server.js } } }