diff --git a/setup/upgrade.sh b/setup/upgrade.sh index 8235fe344..c35dff083 100644 --- a/setup/upgrade.sh +++ b/setup/upgrade.sh @@ -162,9 +162,9 @@ version_error() # set $VERSION version_check() { - VERSION=$(docker-compose exec --user "$(id -u):$(id -g)" -T "$SERVICE" cat .fabmanager-version 2>/dev/null) + VERSION=$(docker-compose exec -T "$SERVICE" cat .fabmanager-version 2>/dev/null) if [[ $? = 1 ]]; then - VERSION=$(docker-compose exec --user "$(id -u):$(id -g)" -T "$SERVICE" cat package.json | jq -r '.version') + VERSION=$(docker-compose exec -T "$SERVICE" cat package.json | jq -r '.version') fi target_version if [ "$TARGET" = 'custom' ]; then return; fi @@ -227,7 +227,7 @@ compile_assets() elevate_cmd chown "$(id -u):$(id -g)" public/new_packs fi # shellcheck disable=SC2068 - if ! docker run --user "$(id -u):$(id -g)" --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; then + if ! docker run --user "0:0" --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; then printf "\e[93m[ ⚠ ] Something may have went wrong while compiling the assets, please check the logs above.\e[39m\n" [[ "$YES_ALL" = "true" ]] && confirm="y" || read -rp ":: Ignore and continue? (Y/n) " confirm