Skip to content
Snippets Groups Projects
Verified Commit efebd247 authored by Konrad Botor's avatar Konrad Botor
Browse files

Empty arguments are no longer passed to Hive

parent 878c8168
No related branches found
No related tags found
1 merge request!844Empty arguments are no longer passed to Hive
...@@ -13,7 +13,7 @@ function log () { ...@@ -13,7 +13,7 @@ function log () {
echo "[Entrypoint] $timestamp INFO [$category] (main) $message" echo "[Entrypoint] $timestamp INFO [$category] (main) $message"
} }
log "global" "Parameters passed directly to Hivemind docker entrypoint: $*" log "global" "Parameters passed directly to Hivemind docker entrypoint: '$*'"
SCRIPT_DIR="$(realpath "$(dirname "${BASH_SOURCE[0]}")")" SCRIPT_DIR="$(realpath "$(dirname "${BASH_SOURCE[0]}")")"
...@@ -64,21 +64,22 @@ while [ $# -gt 0 ]; do ...@@ -64,21 +64,22 @@ while [ $# -gt 0 ]; do
WITH_REPTRACKER=1 WITH_REPTRACKER=1
;; ;;
*) *)
HIVEMIND_ARGS+=("$1") arg=$1
[[ -n "${arg}" ]] && HIVEMIND_ARGS+=("${arg}")
esac esac
shift shift
done done
log "global" "Collected Hivemind arguments: ${HIVEMIND_ARGS[*]}" log "global" "Collected Hivemind arguments: '${HIVEMIND_ARGS[*]}'"
log "global" "Using PostgreSQL instance: $POSTGRES_URL" log "global" "Using PostgreSQL instance: '$POSTGRES_URL'"
log "global" "Using PostgreSQL Admin URL: $POSTGRES_ADMIN_URL" log "global" "Using PostgreSQL Admin URL: '$POSTGRES_ADMIN_URL'"
run_hive_no_exec() { run_hive_no_exec() {
local db_url=${1:-"${POSTGRES_URL}"} local db_url=${1:-"${POSTGRES_URL}"}
# shellcheck source=/dev/null # shellcheck source=/dev/null
source /home/hivemind/.hivemind-venv/bin/activate source /home/hivemind/.hivemind-venv/bin/activate
if [[ -n "$LOG_PATH" ]]; then if [[ -n "$LOG_PATH" ]]; then
log "run_hive" "Starting Hivemind with log $LOG_PATH" log "run_hive" "Starting Hivemind with log '$LOG_PATH'"
hive "${HIVEMIND_ARGS[@]}" --database-url="${db_url}" > >( tee -i "$LOG_PATH" ) 2>&1 hive "${HIVEMIND_ARGS[@]}" --database-url="${db_url}" > >( tee -i "$LOG_PATH" ) 2>&1
else else
log "run_hive" "Starting Hivemind..." log "run_hive" "Starting Hivemind..."
...@@ -91,7 +92,7 @@ run_hive() { ...@@ -91,7 +92,7 @@ run_hive() {
# shellcheck source=/dev/null # shellcheck source=/dev/null
source /home/hivemind/.hivemind-venv/bin/activate source /home/hivemind/.hivemind-venv/bin/activate
if [[ -n "$LOG_PATH" ]]; then if [[ -n "$LOG_PATH" ]]; then
log "run_hive" "Starting Hivemind with log $LOG_PATH" log "run_hive" "Starting Hivemind with log '$LOG_PATH'"
if [[ "$POSTGREST_SERVER" = 1 ]]; then if [[ "$POSTGREST_SERVER" = 1 ]]; then
echo "Running postgrest setup..." echo "Running postgrest setup..."
exec "$SCRIPT_DIR/app/ci/start_postgrest.sh" "${HIVEMIND_ARGS[@]}" --postgres-url="${POSTGRES_URL}" > >( tee -i "$LOG_PATH" ) 2>&1 exec "$SCRIPT_DIR/app/ci/start_postgrest.sh" "${HIVEMIND_ARGS[@]}" --postgres-url="${POSTGRES_URL}" > >( tee -i "$LOG_PATH" ) 2>&1
...@@ -152,6 +153,7 @@ uninstall_app() { ...@@ -152,6 +153,7 @@ uninstall_app() {
} }
log "global" "Command: '${COMMAND}'"
case "$COMMAND" in case "$COMMAND" in
setup) setup)
setup setup
...@@ -180,7 +182,7 @@ case "$COMMAND" in ...@@ -180,7 +182,7 @@ case "$COMMAND" in
POSTGREST_SERVER=1 POSTGREST_SERVER=1
# HIVEMIND_ARGS=($(for i in "${HIVEMIND_ARGS[@]}"; do [[ "$i" != "postgrest-server" ]] && echo "$i"; done)) # HIVEMIND_ARGS=($(for i in "${HIVEMIND_ARGS[@]}"; do [[ "$i" != "postgrest-server" ]] && echo "$i"; done))
HIVEMIND_ARGS=("${HIVEMIND_ARGS[@]:1}") HIVEMIND_ARGS=("${HIVEMIND_ARGS[@]:1}")
log "global" "Running Hivemind with arguments ${HIVEMIND_ARGS[*]}" log "global" "Running Hivemind with arguments '${HIVEMIND_ARGS[*]}'"
run_hive run_hive
;; ;;
*) *)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment