Merge pull request 'fix: fix: gardener-run.sh hardcodes LOG_FILE to read-only $SCRIPT_DIR (#210)' (#216) from fix/issue-210 into main
All checks were successful
ci/woodpecker/push/ci Pipeline was successful
All checks were successful
ci/woodpecker/push/ci Pipeline was successful
This commit is contained in:
commit
9a1c9cc2f7
2 changed files with 2 additions and 2 deletions
|
|
@ -45,7 +45,7 @@ source "$FACTORY_ROOT/lib/agent-sdk.sh"
|
||||||
# shellcheck source=../lib/pr-lifecycle.sh
|
# shellcheck source=../lib/pr-lifecycle.sh
|
||||||
source "$FACTORY_ROOT/lib/pr-lifecycle.sh"
|
source "$FACTORY_ROOT/lib/pr-lifecycle.sh"
|
||||||
|
|
||||||
LOG_FILE="$SCRIPT_DIR/gardener.log"
|
LOG_FILE="${DISINTO_LOG_DIR}/gardener/gardener.log"
|
||||||
# shellcheck disable=SC2034 # consumed by agent-sdk.sh
|
# shellcheck disable=SC2034 # consumed by agent-sdk.sh
|
||||||
LOGFILE="$LOG_FILE"
|
LOGFILE="$LOG_FILE"
|
||||||
# shellcheck disable=SC2034 # consumed by agent-sdk.sh
|
# shellcheck disable=SC2034 # consumed by agent-sdk.sh
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@ FACTORY_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||||
if [ "${DISINTO_CONTAINER:-}" = "1" ]; then
|
if [ "${DISINTO_CONTAINER:-}" = "1" ]; then
|
||||||
DISINTO_DATA_DIR="${HOME}/data"
|
DISINTO_DATA_DIR="${HOME}/data"
|
||||||
DISINTO_LOG_DIR="${DISINTO_DATA_DIR}/logs"
|
DISINTO_LOG_DIR="${DISINTO_DATA_DIR}/logs"
|
||||||
mkdir -p "${DISINTO_DATA_DIR}" "${DISINTO_LOG_DIR}"/{dev,action,review,supervisor,vault,site,metrics}
|
mkdir -p "${DISINTO_DATA_DIR}" "${DISINTO_LOG_DIR}"/{dev,action,review,supervisor,vault,site,metrics,gardener}
|
||||||
else
|
else
|
||||||
DISINTO_LOG_DIR="${FACTORY_ROOT}"
|
DISINTO_LOG_DIR="${FACTORY_ROOT}"
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue