Merge branch 'dev' for release 5.1.13

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog Fab-manager
 
+## v5.1.13 2021 November 16
+
+- Fix a bug: unable to run the setup/upgrade scripts as root
+
 ## v5.1.12 2021 November 10
 
 - Added an automated test on the plan creation endpoint

docker/development/docker-compose.yml

@@ -65,7 +65,7 @@ services:
     #  - "6379:6379"
 
   mailcatcher:
-    image: sleede/mailcatcher
+    image: sj26/mailcatcher
     restart: always
     ## linux
     networks:

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fab-manager",
-  "version": "5.1.12",
+  "version": "5.1.13",
   "description": "Fab-manager is the FabLab management solution. It provides a comprehensive, web-based, open-source tool to simplify your administrative tasks and your marker's projects.",
   "keywords": [
     "fablab",

setup/setup.sh

@@ -194,7 +194,7 @@ prepare_files()
 }
 
 yq() {
-  docker run --rm -i -v "${FABMANAGER_PATH}:/workdir" mikefarah/yq:4 "$@"
+  docker run --rm -i -v "${FABMANAGER_PATH}:/workdir" --user "$UID" mikefarah/yq:4 "$@"
 }
 
 prepare_nginx()

setup/upgrade.sh

@@ -36,7 +36,7 @@ parseparams()
 }
 
 yq() {
-  docker run --rm -i -v "${PWD}:/workdir" mikefarah/yq:4 "$@"
+  docker run --rm -i -v "${PWD}:/workdir" --user "$UID" mikefarah/yq:4 "$@"
 }
 
 jq() {