streamline the deployment process, and cleaning shit up!

scripts/docker_bootstrapper.sh

@@ -0,0 +1,25 @@
+cat << EOF
+    ____  ______________ __
+   / __ \/  _/ ___/ ___// / docker edition
+  / / / // / \__ \\__ \/ / launching bootstrapper...
+ / /_/ // / ___/ /__/ /_/ running as $(whoami) 
+/_____/___//____/____(_)   
+
+EOF
+if [ -z "$(find data -mindepth 1 -maxdepth 1)" ]; then
+  echo '[bootstrapper] data directory is empty, copying template.'
+  cp -r data.template/* data/
+  chown -R disseminate:disseminate data/
+fi
+
+# echo "[bootstrapper] checking permissions for data folder"
+# permissions=$(ls -ld data)
+# ldArr=(${permissions// / })
+
+#if [[ ${ldArr[3]} != "node" ]]; then
+#  echo "[bootstrapper] data folder is owned by user ${ldArr[3]}, which is not node."
+#  echo "[bootstrapper] correcting permissions..."
+#  chown -R 1000:1000 data/
+#fi
+echo "[bootstrapper] launching runner"
+npm run docker:prod:_runner

scripts/docker_build.sh

@@ -1,4 +1,4 @@
 # Disseminate Build Script
 # This script builds disseminate into a docker container, using the dockerfile provided in the repository.
 
-docker build . -t disseminate:latest
+docker build --build-arg UID=1000 --build-arg GID=1000 . -t disseminate:latest

scripts/docker_run.sh

@@ -1,27 +1,14 @@
 # I'm so bad at bash scripting
-cat << EOF
-    ____  ______________ __
-   / __ \/  _/ ___/ ___// /
-  / / / // / \__ \\__ \/ / 
- / /_/ // / ___/ /__/ /_/  
-/_____/___//____/____(_)   
+#cat << EOF
+#    ____  ______________ __
+#   / __ \/  _/ ___/ ___// /
+#  / / / // / \__ \\__ \/ / 
+# / /_/ // / ___/ /__/ /_/  
+#/_____/___//____/____(_)   
+#
+#EOF
 
-EOF
-if [ ! -d data ]; then
-  echo '-------------'
-  echo 'Data folder not found. Did you set up a volume?'
-  echo '-------------'
-  exit 1
-fi
-if [ -z "$(find data -mindepth 1 -maxdepth 1)" ]; then
-  echo '-------------'
-  echo 'Data directory is empty, copying template.'
-  echo '-------------'
-  cp -r data.template/* data/
-fi
-
-
-echo 'Starting...'
+echo '[runner] starting...'
 node src/index.js
-echo 'Exiting...'
+echo '[runner] exited.'
 

scripts/docker_test.sh

@@ -1,5 +1,8 @@
 # Disseminate docker test script
-
 mkdir ignore
 cd ignore
+
 docker run --rm -it -p 3024:3024 -v ./data:/app/data disseminate:latest
+
+cd ..
+rm -R ignore

scripts/docker_test_bash.sh

@@ -2,5 +2,6 @@
 
 mkdir ignore
 cd ignore
-docker run --rm -it -p 3024:3024 -v ./data:/app/data disseminate:latest /bin/sh
+docker run --rm -it -p 3024:3024 --user 1000:1000 -v ./data:/app/data disseminate:latest /bin/bash
+cd ..
 rm ignore