Commit da0421f7 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' of gitlab.com:redmic-project/postgres/backup-db into dev

parents fb3b97c1 dce509b3

Dockerfile

+6 −10
Original line number Diff line number Diff line
@@ -17,22 +17,18 @@ ENV POSTGRES_PORT="5432" \ 
COPY scripts /



ARG CURL_VERSION=7.74.0-r1

ARG POSTGRESQL_CLIENT_VERSION=10.12-r0

ARG POSTGRESQL_CLIENT_VERSION=10.10-r0

ARG BASH_VERSION=5.1.0-r0

ARG XZ_VERSION=5.2.5-r0

RUN apk list \

RUN echo "https://dl-cdn.alpinelinux.org/alpine/v3.7/main" >> /etc/apk/repositories && \

	apk update && \

	apk list \

		curl \

		postgresql-client \

		bash \

		glib \

		xz && \

	echo "http://dl-cdn.alpinelinux.org/alpine/v3.8/main" >> /etc/apk/repositories && \

	apk update && \

		bash && \

	apk add --no-cache \

		curl=${CURL_VERSION} \

		postgresql-client=${POSTGRESQL_CLIENT_VERSION} \

		bash=${BASH_VERSION} \

		xz=${XZ_VERSION}

		bash=${BASH_VERSION}



ARG GLIBC_VER=2.33-r0

ARG AWS_CLI_VERSION=2.0.30

deploy/.env

+1 −2
Original line number Diff line number Diff line
@@ -2,9 +2,8 @@ ALPINE_IMAGE_TAG=3.13 
POSTGRES_PASS_FILE=/root/.pgpass

POSTGRES_DUMP_PATH=/tmp/backup

CURL_VERSION=7.74.0-r1

POSTGRESQL_CLIENT_VERSION=10.12-r0

POSTGRESQL_CLIENT_VERSION=10.10-r0

BASH_VERSION=5.1.0-r0

XZ_VERSION=5.2.5-r0

GLIBC_VER=2.33-r0

AWS_CLI_VERSION=2.0.30

deploy/docker-compose.tmpl.yml

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ services: 
        CURL_VERSION:

        POSTGRESQL_CLIENT_VERSION:

        BASH_VERSION:

        XZ_VERSION:

        GLIBC_VER:

        AWS_CLI_VERSION:

    environment:

scripts/docker-entrypoint.sh

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
export PGPASSFILE="${POSTGRES_PASS_FILE}"



NOW_DATE=$(date +%Y-%m-%d_%H_%M_%S)

ZIP_FILENAME="${NOW_DATE}-backup.tar.xz"

ZIP_FILENAME="${NOW_DATE}-backup.tar.gz"

DUMP_FILENAME="${DUMP_FILENAME:-db.dump}"



TIMEFORMAT="%R"
@@ -76,7 +76,7 @@ function compress() { 
	echo "Compressing backup"

	local start_seconds=${SECONDS}



	tar cvJf ${ZIP_FILENAME} ${DUMP_FILENAME}

	tar cvzf ${ZIP_FILENAME} ${DUMP_FILENAME}



	COMPRESS_DURATION_SECONDS=$(( SECONDS - start_seconds ))

	COMPRESS_SIZE=$( size_file "${ZIP_FILENAME}" )