Reverse update to reflect the new docker with integrated 'compose' and return to 'docker-compose' as the binary name.

This commit is contained in:
Dave Lane 2022-11-24 03:23:20 +00:00
parent eb625966b0
commit 35f979e8fa

View file

@ -47,7 +47,7 @@ GREP=`which grep`
# email program # email program
MAIL=`which mail` MAIL=`which mail`
# database dump utility # database dump utility
DC=`which docker` DC=`which docker-compose`
#DEF_ARGS="-C -d -O -x" #DEF_ARGS="-C -d -O -x"
# #
# pattern for "ls" command to build list of # pattern for "ls" command to build list of
@ -136,13 +136,13 @@ delete_old() {
do_backup() { do_backup() {
FILE=$1 FILE=$1
CONTAINER=$2 CONTAINER=$2
VER=`$DC compose exec $CONTAINER pg_config --version` VER=`$DC exec $CONTAINER pg_config --version`
verbose "Postgres version $VER - echoing to backup: $FILE" verbose "Postgres version $VER - echoing to backup: $FILE"
echo "--" > $FILE echo "--" > $FILE
echo "-- PostgreSQL Version: $VER" >> $FILE echo "-- PostgreSQL Version: $VER" >> $FILE
echo "--" >> $FILE echo "--" >> $FILE
echo "" >> $FILE echo "" >> $FILE
CMD="$DC compose exec $CONTAINER $DUMP_CMD" CMD="$DC exec $CONTAINER $DUMP_CMD"
verbose "doing database dump: $CMD" verbose "doing database dump: $CMD"
$CMD >> $FILE $CMD >> $FILE
} }