diff options
| author | jc0b <j.burley@vu.nl> | 2020-05-11 20:43:36 +0200 |
|---|---|---|
| committer | jc0b <j.burley@vu.nl> | 2020-05-11 20:43:36 +0200 |
| commit | 64c6d6dc7638203615f08bfc83355405c4236878 (patch) | |
| tree | 44261347d1d0fe9b6b2890ba2b3b245f98ae2a72 | |
| parent | 9663374aa7f086b8a0aa9e0f254f0487f5ce09b4 (diff) | |
| parent | 4997f86738a6a81c1f8f5a4e17d9cb14401cddc3 (diff) | |
Merge remote-tracking branch 'origin/master' into feature/mongodb-migration
| -rw-r--r-- | Dockerfile | 2 | ||||
| -rwxr-xr-x | build/configure.sh | 2 | ||||
| m--------- | opendc-frontend | 26 |
3 files changed, 13 insertions, 17 deletions
@@ -1,4 +1,4 @@ -FROM node:7.4 +FROM node:14.2.0 MAINTAINER Sacheendra Talluri <sacheendra.t@gmail.com> # Installing python and web-server dependencies diff --git a/build/configure.sh b/build/configure.sh index e8676960..eb7324d2 100755 --- a/build/configure.sh +++ b/build/configure.sh @@ -20,6 +20,8 @@ until eval $MYSQL_COMMAND -e "use opendc;" ; do sleep 1 done +echo "MariaDB available" + NUM_TABLES=$(eval "$MYSQL_COMMAND -B --disable-column-names -e \"SELECT count(*) FROM information_schema.tables WHERE table_schema='$MYSQL_DATABASE';\"") # Check if database is empty diff --git a/opendc-frontend b/opendc-frontend -Subproject 0c7862a97ed957fe6d96bbd2ef8545b5c4be23d +Subproject e65b805e94052d993f7ef486226cae0ebf9965b |