Skip to content

Commit 9c6255d

Browse files
committed
string instead of boolean
1 parent 584edce commit 9c6255d

File tree

4 files changed

+32
-22
lines changed

4 files changed

+32
-22
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
## 1.6.1 (2.9.2025)
4+
5+
- use always string (instead of boolean) for true and false
6+
37
## 1.6.0 (12.05.2025)
48

59
- updated software versions and debian base image

entry.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ log "DEBUG" "MSMTP_ARGS: ${MSMTP_ARGS}"
4646
log "DEBUG" "HEALTHCHECK_URL: ${HEALTHCHECK_URL}"
4747
log "DEBUG" "USER_AGENT: ${USER_AGENT}"
4848

49-
if [ "${RESTIC_SKIP_INIT}" == true ]; then
49+
if [ "${RESTIC_SKIP_INIT}" = "true" ]; then
5050
log "INFO" "Skip restic init"
5151
else
5252
log "DEBUG" "Check if restic repository exists, otherwise initialize."

log.sh

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,31 @@
22
# $LOG_LEVEL is the requested log level of the container, defined by the user in the ENV_VARIABLES
33
# $LEVEL is the level of the log message.
44

5+
set_default() {
6+
local var_name=$1
7+
local default_value=$2
8+
export "$var_name"="${!var_name:-$default_value}"
9+
}
10+
511
# set default values for all other environment variables
6-
export BACKUP_CRON=${BACKUP_CRON:="20 2 * * *"}
7-
export CHECK_CRON=${CHECK_CRON:="40 3 * * 6"}
8-
export LOG_LEVEL=${LOG_LEVEL:="INFO"}
9-
export LOG_TYPE=${LOG_TYPE:="stdout"}
10-
export RESTIC_TAG=${RESTIC_TAG:="seatable"}
11-
export RESTIC_DATA_SUBSET=${RESTIC_DATA_SUBSET:="1G"}
12-
export RESTIC_FORGET_ARGS=${RESTIC_FORGET_ARGS:=""}
13-
export RESTIC_JOB_ARGS=${RESTIC_JOB_ARGS:=""}
14-
export RESTIC_SKIP_INIT=${RESTIC_SKIP_INIT:="false"}
15-
export DATABASE_DUMP=${DATABASE_DUMP:="false"}
16-
export DATABASE_HOST=${DATABASE_HOST:="mariadb"}
17-
export DATABASE_USER=${DATABASE_USER:="root"}
18-
export DATABASE_LIST=${DATABASE_LIST:=""}
19-
export DATABASE_DUMP_COMPRESSION=${DATABASE_DUMP_COMPRESSION:="false"}
20-
export SEATABLE_BIGDATA_DUMP=${SEATABLE_BIGDATA_DUMP:="false"}
21-
export SEATABLE_BIGDATA_HOST=${SEATABLE_BIGDATA_HOST:="seatable-server"}
22-
export HEALTHCHECK_URL=${HEALTHCHECK_URL:=""}
23-
export USER_AGENT=${USER_AGENT:="restic-backup-docker/1.6.0"}
12+
set_default BACKUP_CRON "20 2 * * *"
13+
set_default CHECK_CRON "40 3 * * 6"
14+
set_default LOG_LEVEL "INFO"
15+
set_default LOG_TYPE "stdout"
16+
set_default RESTIC_TAG "seatable"
17+
set_default RESTIC_DATA_SUBSET "1G"
18+
set_default RESTIC_FORGET_ARGS ""
19+
set_default RESTIC_JOB_ARGS ""
20+
set_default RESTIC_SKIP_INIT false
21+
set_default DATABASE_DUMP false
22+
set_default DATABASE_HOST "mariadb"
23+
set_default DATABASE_USER "root"
24+
set_default DATABASE_LIST ""
25+
set_default DATABASE_DUMP_COMPRESSION "false"
26+
set_default SEATABLE_BIGDATA_DUMP "false"
27+
set_default SEATABLE_BIGDATA_HOST "seatable-server"
28+
set_default HEALTHCHECK_URL ""
29+
set_default USER_AGENT "restic-backup-docker/1.6.1"
2430

2531
log() {
2632
local LEVEL="$1"

pre-default.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ command_exists() {
1313
}
1414

1515
# DATABASE DUMP
16-
if [ "${DATABASE_DUMP}" == true ] || [ "${SEATABLE_DATABASE_DUMP}" == true ]; then
16+
if [ "${DATABASE_DUMP}" = "true" ] || [ "${SEATABLE_DATABASE_DUMP}" = "true" ]; then
1717

1818
log "DEBUG" "Check for correct dump command"
1919
# Check for mysqldump or mariadb-dump
@@ -41,7 +41,7 @@ if [ "${DATABASE_DUMP}" == true ] || [ "${SEATABLE_DATABASE_DUMP}" == true ]; th
4141
fi
4242

4343
# compress the dump files
44-
if [ "${DATABASE_DUMP_COMPRESSION}" == true ]; then
44+
if [ "${DATABASE_DUMP_COMPRESSION}" = "true" ]; then
4545
log "INFO" "Compressing dump files"
4646
find /data/database-dumps -name "*.dump" -type f -exec gzip -f {} +
4747
log "DEBUG" "Compression complete"
@@ -53,7 +53,7 @@ else
5353
fi
5454

5555
# BIG DATA DUMP
56-
if [ "${SEATABLE_BIGDATA_DUMP}" == true ]; then
56+
if [ "${SEATABLE_BIGDATA_DUMP}" == "true" ]; then
5757
log "INFO" "Dump big data"
5858
/usr/local/bin/docker exec ${SEATABLE_BIGDATA_HOST} /opt/seatable/scripts/seatable.sh backup-all
5959
log "INFO" "Dump finished"

0 commit comments

Comments
 (0)