1
0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-02-20 14:54:15 +01:00

Merge branch 'dev' for release 5.4.6

This commit is contained in:
Sylvain 2022-06-27 16:07:33 +02:00
commit fcc4d97d0d
11 changed files with 14 additions and 10 deletions

View File

@ -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

View File

@ -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

View File

@ -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",

View File

@ -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() {

View File

@ -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()

View File

@ -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()

View File

@ -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()

View File

@ -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()

View File

@ -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 "$@"
}

View File

@ -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() {

View File

@ -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()