Commit a12a34d6 authored Dec 21, 2021 by Pedro Eduardo Trujillo

Merge branch 'dev' into 'master'

Dev

See merge request redmic-project/maintenance/backup-files!6

parents 7c8257cf 052ecbc9

.gitignore

deleted100644 → 0

+0 −0

Empty file deleted.

Dockerfile

+1 −1

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@ FROM alpine:${ALPINE_IMAGE_TAG}
		LABEL maintainer="info@redmic.es"

		ARG BACKUP_PATH=/backup \
		CURL_VERSION=7.74.0-r1 \
		CURL_VERSION=7.79.1-r0 \
		BASH_VERSION=5.1.0-r0 \
		GLIBC_VERSION=2.33-r0 \
		AWS_CLI_VERSION=2.0.30

README.md

+16 −15

Original line number	Diff line number	Diff line
		@@ -19,10 +19,11 @@ Also sends metrics to Prometheus through Pushgateway.
		## Variables

		\| Name \| Description \| Default \|
		\|-----------------------\|-------------------------------------------------\|----------------------\|
		\|-----------------------\|---------------------------------------------------\|----------------------\|
		\| BACKUP_VOL_NAME \| Docker volume name to mount as source \| \|
		\| BACKUP_PATH \| Root path to find paths to backup \| /backup \|
		\| PATHS_TO_BACKUP \| Paths to include in backup (separated by space) \| \|
		\| PATHS_TO_EXCLUDE \| Paths to exclude from backup (separated by space) \| \|
		\| WORK_PATH \| Temporal path for working \| /tmp/backup \|
		\| UPLOAD_BUCKET \| Bucket name for uploads \| backup-files \|
		\| UPLOAD_ENDPOINT_URL \| URL for uploads (S3-compatible) \| \|

deploy/.env

+1 −1

Original line number	Diff line number	Diff line
		ALPINE_IMAGE_TAG=3.13
		CURL_VERSION=7.74.0-r1
		CURL_VERSION=7.79.1-r0
		BASH_VERSION=5.1.0-r0
		GLIBC_VERSION=2.33-r0
		AWS_CLI_VERSION=2.0.30

deploy/docker-compose.tmpl.yml

+1 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@ services:
		environment:
		BACKUP_PATH:
		PATHS_TO_BACKUP:
		PATHS_TO_EXCLUDE:
		WORK_PATH:
		UPLOAD_BUCKET:
		UPLOAD_ENDPOINT_URL: