IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add OCI execution logging

Browse Source
This commit is contained in:
Evgeniy Antonyuk 2024-07-09 17:51:10 +03:00
parent 0b08a09a40
commit f5951e06c1
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
install/OneClickInstall/docspace-install.sh
View File

@ -37,9 +37,11 @@ LOCAL_SCRIPTS="false"
product="docspace" product="docspace"
product_sysname="onlyoffice"; product_sysname="onlyoffice";
FILE_NAME="$(basename "$0")" FILE_NAME="$(basename "$0")"
ENABLE_LOGGING="true"
while [ "$1" != "" ]; do while [ "$1" != "" ]; do
case $1 in case $1 in
-log | --logging ) [ "$2" == "true" -o "$2" == "false" ] && { ENABLE_LOGGING=$2; shift; } ;;
-ls | --localscripts ) [ "$2" == "true" -o "$2" == "false" ] && { PARAMETERS+=" $1"; LOCAL_SCRIPTS=$2; shift; } ;; -ls | --localscripts ) [ "$2" == "true" -o "$2" == "false" ] && { PARAMETERS+=" $1"; LOCAL_SCRIPTS=$2; shift; } ;;
-gb | --gitbranch ) [ -n "$2" ] && { PARAMETERS+=" $1"; GIT_BRANCH=$2; shift; } ;; -gb | --gitbranch ) [ -n "$2" ] && { PARAMETERS+=" $1"; GIT_BRANCH=$2; shift; } ;;
docker ) DOCKER="true"; shift && continue ;; docker ) DOCKER="true"; shift && continue ;;
@ -50,6 +52,7 @@ while [ "$1" != "" ]; do
echo "Run 'bash $FILE_NAME docker' to install Docker version of application." echo "Run 'bash $FILE_NAME docker' to install Docker version of application."
echo "Run 'bash $FILE_NAME package' to install DEB/RPM version." echo "Run 'bash $FILE_NAME package' to install DEB/RPM version."
echo "Run 'bash $FILE_NAME docker -h' or 'bash $FILE_NAME package -h' to get more details." echo "Run 'bash $FILE_NAME docker -h' or 'bash $FILE_NAME package -h' to get more details."
echo "To disable logging, use the '-log' environment variable with a value of 'false'"
exit 0; exit 0;
fi fi
PARAMETERS="$PARAMETERS -ht $FILE_NAME"; PARAMETERS="$PARAMETERS -ht $FILE_NAME";
@ -118,8 +121,15 @@ else
exit 1 exit 1
fi fi
if [ "$ENABLE_LOGGING" = "true" ]; then
LOG_FILE="OneClick${SCRIPT_NAME%.sh}_$(date +%Y%m%d_%H%M%S).log"
touch "${LOG_FILE}" || { echo "Failed to create log file"; exit 1; }
exec > >(tee "${LOG_FILE}") 2>&1
fi
[ "$LOCAL_SCRIPTS" != "true" ] && curl -s -O ${DOWNLOAD_URL_PREFIX}/${SCRIPT_NAME} [ "$LOCAL_SCRIPTS" != "true" ] && curl -s -O ${DOWNLOAD_URL_PREFIX}/${SCRIPT_NAME}
bash ${SCRIPT_NAME} ${PARAMETERS} || EXIT_CODE=$? bash ${SCRIPT_NAME} ${PARAMETERS} || EXIT_CODE=$?
[ "$LOCAL_SCRIPTS" != "true" ] && rm ${SCRIPT_NAME} [ "$LOCAL_SCRIPTS" != "true" ] && rm ${SCRIPT_NAME}
[ "$ENABLE_LOGGING" = "true" ] && [ $EXIT_CODE -eq 0 ] && rm "${LOG_FILE}"
exit ${EXIT_CODE:-0} exit ${EXIT_CODE:-0}

2
tests/vagrant/install.sh
View File

@ -208,7 +208,7 @@ function install_docspace() {
sed 's/set -e/set -xe/' -i *.sh sed 's/set -e/set -xe/' -i *.sh
fi fi
printf "N\nY\nY" | bash docspace-install.sh ${ARGUMENTS} printf "N\nY\nY" | bash docspace-install.sh ${ARGUMENTS} -log false
if [[ $? != 0 ]]; then if [[ $? != 0 ]]; then
echo "Exit code non-zero. Exit with 1." echo "Exit code non-zero. Exit with 1."