Docker script updates

scripts/make.sh

@@ -34,8 +34,7 @@ makeNextSubmodule() {
   ln -sf "$PWD/submodules/${1}/out" "$PWD/nextStatic/${2}"
 }
 
-log 'Making project'
+log "Making project"
-log "Installing node modules for server"
 npm install
 npm audit fix
 npm run export
@@ -75,13 +74,15 @@ setupJson publicDirs/qminingPublic/news.json
 touch publicDirs/qminingPublic/version
 touch publicDirs/qminingPublic/motd
 
-if [ -z "$(ls -A ./src/standaloneUtils)" ]; then
+if [ -z "$(ls -A ./data/dbs)" ]; then
   pushd src/standaloneUtils
   NS_LOGLEVEL=2 node dbSetup.js
-  mv *db ../../data/dbs
+  mv *.db ../../data/dbs
   popd
 fi
 
+npx --yes next telemetry disable
+
 hr
 echo "Done!"
 echo "npm start {loglevel}"

scripts/runDocker.sh

@@ -1,8 +1,28 @@
 #!/bin/bash
 
+repoName='qminer/mrfrys-node-server'
+
+function getContainerId() {
+  docker ps -a | grep -i "${repoName}" | xargs | cut -d' ' -f1
+}
+
+function getDockerRepoId() {
+  docker images | grep "${repoName}" | xargs | cut -d' ' -f3
+}
+
 if [ "$1" == "build" ]; then
   docker build . -t qminer/mrfrys-node-server
-  exit
+elif [ "$1" == "rebuild" ]; then
+  docker rmi -f $(getDockerRepoId)
+  docker build . -t qminer/mrfrys-node-server
+elif [ "$1" == "build" ]; then
+  docker build . -t qminer/mrfrys-node-server
+elif [ "$1" == "stop" ]; then
+  docker stop $(getContainerId)
+elif [ "$1" == "start" ]; then
+  # --entrypoint bash \
+  scripts/setup.sh
+  docker start -i $(getContainerId)
 elif [ "$1" == "run" ]; then
   # --entrypoint bash \
   scripts/setup.sh
@@ -13,7 +33,7 @@ elif [ "$1" == "run" ]; then
     --mount src="$(pwd)/publicDirs",target=/server/publicDirs,type=bind \
     qminer/mrfrys-node-server
 elif [ "$1" == "bash" ]; then
-  docker exec -it "<container id>" /bin/bash
+  docker exec -it $(getContainerId) /bin/bash
 else
   echo 'params: "build" or "run"'
 fi

scripts/start.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+scripts/make.sh
+npm run start