martinan/vaultwarden-backup
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

feat: add curl options environment variable

Browse Source
This commit is contained in:
ttionya
2024-09-05 23:40:44 +08:00
parent 830acd6d65
commit 753d19dc5d
4 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.env
View File

@@ -11,9 +11,13 @@
# BACKUP_FILE_SUFFIX="%Y%m%d"
# BACKUP_KEEP_DAYS="0"
# PING_URL=""
# PING_URL_CURL_OPTIONS=""
# PING_URL_WHEN_START=""
# PING_URL_WHEN_START_CURL_OPTIONS=""
# PING_URL_WHEN_SUCCESS=""
# PING_URL_WHEN_SUCCESS_CURL_OPTIONS=""
# PING_URL_WHEN_FAILURE=""
# PING_URL_WHEN_FAILURE_CURL_OPTIONS=""
# MAIL_SMTP_ENABLE="FALSE"
# MAIL_SMTP_VARIABLES=""
# MAIL_TO=""

2
Dockerfile
View File

@@ -13,7 +13,7 @@ COPY scripts/*.sh /app/
RUN chmod +x /app/*.sh \
&& mkdir -m 777 /bitwarden \
&& apk add --no-cache 7zip bash mariadb-client postgresql16-client sqlite supercronic s-nail tzdata \
&& apk add --no-cache 7zip bash curl mariadb-client postgresql16-client sqlite supercronic s-nail tzdata \
&& apk info --no-cache -Lq mariadb-client | grep -vE '/bin/mariadb$' | grep -vE '/bin/mariadb-dump$' | xargs -I {} rm -f "/{}" \
&& ln -sf "${LOCALTIME_FILE}" /etc/localtime \
&& addgroup -g "${USER_ID}" "${USER_NAME}" \

4
docker-compose.yml
View File

@@ -27,9 +27,13 @@ services:
# BACKUP_FILE_SUFFIX: '%Y%m%d'
# BACKUP_KEEP_DAYS: 0
# PING_URL: ''
# PING_URL_CURL_OPTIONS: ''
# PING_URL_WHEN_START: ''
# PING_URL_WHEN_START_CURL_OPTIONS: ''
# PING_URL_WHEN_SUCCESS: ''
# PING_URL_WHEN_SUCCESS_CURL_OPTIONS: ''
# PING_URL_WHEN_FAILURE: ''
# PING_URL_WHEN_FAILURE_CURL_OPTIONS: ''
# MAIL_SMTP_ENABLE: 'FALSE'
# MAIL_SMTP_VARIABLES: ''
# MAIL_TO: ''

24
scripts/includes.sh
View File

@@ -345,16 +345,16 @@ function init_env() {
color yellow "BACKUP_FILE_DATE_FORMAT: ${BACKUP_FILE_DATE_FORMAT} (example \"[filename].$(date +"${BACKUP_FILE_DATE_FORMAT}").[ext]\")"
color yellow "BACKUP_KEEP_DAYS: ${BACKUP_KEEP_DAYS}"
if [[ -n "${PING_URL}" ]]; then
color yellow "PING_URL: ${PING_URL}"
color yellow "PING_URL: curl${PING_URL_CURL_OPTIONS:+" ${PING_URL_CURL_OPTIONS}"} ${PING_URL}"
fi
if [[ -n "${PING_URL_WHEN_START}" ]]; then
color yellow "PING_URL_WHEN_START: ${PING_URL_WHEN_START}"
color yellow "PING_URL_WHEN_START: curl${PING_URL_WHEN_START_CURL_OPTIONS:+" ${PING_URL_WHEN_START_CURL_OPTIONS}"} ${PING_URL_WHEN_START}"
fi
if [[ -n "${PING_URL_WHEN_SUCCESS}" ]]; then
color yellow "PING_URL_WHEN_SUCCESS: ${PING_URL_WHEN_SUCCESS}"
color yellow "PING_URL_WHEN_SUCCESS: curl${PING_URL_WHEN_SUCCESS_CURL_OPTIONS:+" ${PING_URL_WHEN_SUCCESS_CURL_OPTIONS}"} ${PING_URL_WHEN_SUCCESS}"
fi
if [[ -n "${PING_URL_WHEN_FAILURE}" ]]; then
color yellow "PING_URL_WHEN_FAILURE: ${PING_URL_WHEN_FAILURE}"
color yellow "PING_URL_WHEN_FAILURE: curl${PING_URL_WHEN_FAILURE_CURL_OPTIONS:+" ${PING_URL_WHEN_FAILURE_CURL_OPTIONS}"} ${PING_URL_WHEN_FAILURE}"
fi
color yellow "MAIL_SMTP_ENABLE: ${MAIL_SMTP_ENABLE}"
if [[ "${MAIL_SMTP_ENABLE}" == "TRUE" ]]; then
@@ -452,17 +452,33 @@ function init_env_ping() {
get_env PING_URL
PING_URL="${PING_URL:-""}"
# PING_URL_CURL_OPTIONS
get_env PING_URL_CURL_OPTIONS
PING_URL_CURL_OPTIONS="${PING_URL_CURL_OPTIONS:-""}"
# PING_URL_WHEN_START
get_env PING_URL_WHEN_START
PING_URL_WHEN_START="${PING_URL_WHEN_START:-""}"
# PING_URL_WHEN_START_CURL_OPTIONS
get_env PING_URL_WHEN_START_CURL_OPTIONS
PING_URL_WHEN_START_CURL_OPTIONS="${PING_URL_WHEN_START_CURL_OPTIONS:-""}"
# PING_URL_WHEN_SUCCESS
get_env PING_URL_WHEN_SUCCESS
PING_URL_WHEN_SUCCESS="${PING_URL_WHEN_SUCCESS:-""}"
# PING_URL_WHEN_SUCCESS_CURL_OPTIONS
get_env PING_URL_WHEN_SUCCESS_CURL_OPTIONS
PING_URL_WHEN_SUCCESS_CURL_OPTIONS="${PING_URL_WHEN_SUCCESS_CURL_OPTIONS:-""}"
# PING_URL_WHEN_FAILURE
get_env PING_URL_WHEN_FAILURE
PING_URL_WHEN_FAILURE="${PING_URL_WHEN_FAILURE:-""}"
# PING_URL_WHEN_FAILURE_CURL_OPTIONS
get_env PING_URL_WHEN_FAILURE_CURL_OPTIONS
PING_URL_WHEN_FAILURE_CURL_OPTIONS="${PING_URL_WHEN_FAILURE_CURL_OPTIONS:-""}"
}
function init_env_mail() {