diff --git a/Dockerfile b/Dockerfile index ad33265..fb73f85 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ -FROM alpine:3.15 +FROM alpine:3.18 RUN apk update \ - && apk --no-cache add dumb-init postgresql-client curl aws-cli + && apk --no-cache add dumb-init postgresql15-client curl aws-cli RUN curl -L https://github.com/odise/go-cron/releases/download/v0.0.7/go-cron-linux.gz | zcat > /usr/local/bin/go-cron && chmod +x /usr/local/bin/go-cron @@ -9,4 +9,4 @@ COPY entrypoint.sh . COPY backup.sh . ENTRYPOINT ["/usr/bin/dumb-init", "--"] -CMD ["sh", "entrypoint.sh"] \ No newline at end of file +CMD ["sh", "entrypoint.sh"] diff --git a/backup.sh b/backup.sh index 5f2ab59..ca0f144 100644 --- a/backup.sh +++ b/backup.sh @@ -13,7 +13,7 @@ fi # env vars needed for pg_dump export PGPASSWORD=$POSTGRES_PASSWORD -POSTGRES_HOST_OPTS="-h $POSTGRES_HOST -p $POSTGRES_PORT -U $POSTGRES_USER $POSTGRES_EXTRA_OPTS" +#POSTGRES_HOST_OPTS="-h $POSTGRES_HOST -p $POSTGRES_PORT -U $POSTGRES_USER $POSTGRES_EXTRA_OPTS" case "${PG_BACKUP_ACTION:-dump}" in dump) @@ -55,7 +55,7 @@ case "${PG_BACKUP_ACTION:-dump}" in # TODO: check if database is fresh echo "Snapshotting $POSTGRES_DB database" - pg_dump -Fc $POSTGRES_HOST_OPTS $POSTGRES_DB > dump.backup + pg_dump -U $POSTGRES_USER -h $POSTGRES_HOST -p $POSTGRES_PORT -d $POSTGRES_DB -Fc -b -v -f dump.backup aws configure set default.s3.multipart_chunksize 16MB if [ "${PRIVATE_BACKUP}" == "true" ] || [ "${PRIVATE_BACKUP}" == "1" ]; then