Merge branch 'dev' for release 4.7.5

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog Fab-manager
 
+## v4.7.5 2021 March 08
+- Fix a bug: unable to compile the assets during the upgrade, if the env file has some whitespaces around the equal sign
+
 ## v4.7.4 2021 March 08
 - Show remaining training credits in the dashboard
 - Allow writing short rich descriptions for each subscription plan

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fab-manager",
-  "version": "4.7.4",
+  "version": "4.7.5",
   "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/upgrade.sh

@@ -95,6 +95,12 @@ add_environments()
   done
 }
 
+clean_env_file()
+{
+  # docker run --env-file does not support whitespaces in the environment variables so we must clean the file
+  sed -ri 's/^([A-Z0-9_]+)\s*=\s*(.*)$/\1=\2/g' ./config/env
+}
+
 compile_assets()
 {
   IMAGE=$(yq eval '.services.*.image | select(. == "sleede/fab-manager*")' docker-compose.yml)
@@ -106,6 +112,7 @@ compile_assets()
     exit 1
   fi
   PG_NET_ID=$(docker inspect "$PG_ID" -f "{{json .NetworkSettings.Networks }}" | jq -r '.[] .NetworkID')
+  clean_env_file
   # shellcheck disable=SC2068
   docker run --rm --env-file ./config/env ${ENV_ARGS[@]} --link "$PG_ID" --net "$PG_NET_ID" -v "${PWD}/public/new_packs:/usr/src/app/public/packs" "$IMAGE" bundle exec rake assets:precompile
   docker-compose down