Merge branch 'dev' for release 5.4.6

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## next deploy
 
+## v5.4.6 2022 June 27
+
+- Fix a bug: unable to run yq in deployment scripts
+
 ## v5.4.5 2022 June 27
 
 - Feature the next event in the event page

app/controllers/api/proof_of_identity_types_controller.rb

@@ -28,7 +28,7 @@ class API::ProofOfIdentityTypesController < API::ApiController
     if @proof_of_identity_type.update(proof_of_identity_type_params)
       render status: :ok
     else
-      render json: @pack.errors.full_messages, status: :unprocessable_entity
+      render json: @proof_of_identity_type.errors.full_messages, status: :unprocessable_entity
     end
   end
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fab-manager",
-  "version": "5.4.5",
+  "version": "5.4.6",
   "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",

scripts/cve-2021-44228.sh

@@ -3,7 +3,7 @@
 # This script fixes the log4j CVE-2021-44228 vulnerability for instances using Elasticsearch 5.x
 
 yq() {
-  docker run --rm -i -v "${PWD}:/workdir" mikefarah/yq:4 "$@"
+  docker run --rm -i -v "${PWD}:/workdir" --user "$UID" mikefarah/yq:4 "$@"
 }
 
 config() {

scripts/mount-payment-schedules.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 yq() {
-  docker run --rm -i -v "${PWD}:/workdir" mikefarah/yq:4 "$@"
+  docker run --rm -i -v "${PWD}:/workdir" --user "$UID" mikefarah/yq:4 "$@"
 }
 
 config()

scripts/mount-proof-of-identity-files.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 yq() {
-  docker run --rm -i -v "${PWD}:/workdir" mikefarah/yq:4 "$@"
+  docker run --rm -i -v "${PWD}:/workdir" --user "$UID" mikefarah/yq:4 "$@"
 }
 
 config()

scripts/mount-webpack.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 yq() {
-  docker run --rm -i -v "${PWD}:/workdir" mikefarah/yq:4 "$@"
+  docker run --rm -i -v "${PWD}:/workdir" --user "$UID" mikefarah/yq:4 "$@"
 }
 
 config()

scripts/nginx-packs-directive.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 yq() {
-  docker run --rm -i -v "${NGINX_PATH}:/workdir" mikefarah/yq:4 "$@"
+  docker run --rm -i -v "${NGINX_PATH}:/workdir" --user "$UID" mikefarah/yq:4 "$@"
 }
 
 config()

scripts/redis-upgrade.sh

@@ -60,7 +60,7 @@ test_docker_compose()
 }
 
 yq() {
-  docker run --rm -i -v "${FM_PATH}:/workdir" mikefarah/yq:4 "$@"
+  docker run --rm -i -v "${FM_PATH}:/workdir" --user "$UID" mikefarah/yq:4 "$@"
 }
 
 

scripts/run.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 yq() {
-  docker run --rm -i -v "${PWD}:/workdir" mikefarah/yq:4 "$@"
+  docker run --rm -i -v "${PWD}:/workdir" --user "$UID" mikefarah/yq:4 "$@"
 }
 
 config() {

scripts/set-docker-user.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 yq() {
-  docker run --rm -i -v "${PWD}:/workdir" mikefarah/yq:4 "$@"
+  docker run --rm -i -v "${PWD}:/workdir" --user "$UID" mikefarah/yq:4 "$@"
 }
 
 config()