diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 937299c..2ae3a0b 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.6.10 +current_version = 0.6.11 commit = True tag = True diff --git a/src/_backup.sh b/src/_backup.sh index 503c87a..bd8766e 100644 --- a/src/_backup.sh +++ b/src/_backup.sh @@ -44,14 +44,18 @@ function backup_fullUploadsBackup() { function backup_fullCouchbaseBackup() { info "$couchbaseComposeService: Performing backup of couchbase database" local user_id=$(id -u plextrac) - local cmd="compose_client exec -T --user $user_id" + local cmd="compose_client exec -T" if [ "$CONTAINER_RUNTIME" == "podman" ]; then - cmd='docker exec' + cmd='podman exec' fi if [ "$CONTAINER_RUNTIME" != "podman" ]; then debug "`$cmd $couchbaseComposeService \ chown -R $user_id:$user_id /backups 2>&1`" fi + local cmd="compose_client exec -T --user $user_id" + if [ "$CONTAINER_RUNTIME" == "podman" ]; then + cmd='podman exec' + fi debug "`$cmd $couchbaseComposeService \ cbbackup -m full "http://127.0.0.1:8091" /backups -u ${CB_BACKUP_USER} -p ${CB_BACKUP_PASS} 2>&1`" latestBackup=`ls -dc1 ${PLEXTRAC_BACKUP_PATH}/couchbase/* | head -n1` @@ -66,7 +70,7 @@ function backup_fullPostgresBackup() { local user_id=$(id -u plextrac) local cmd="compose_client exec -T --user $user_id" if [ "$CONTAINER_RUNTIME" == "podman" ]; then - cmd='docker exec' + cmd='podman exec' fi if [ "$CONTAINER_RUNTIME" != "podman" ]; then debug "`compose_client exec -T $postgresComposeService chown -R $user_id:$user_id /backups 2>&1`" diff --git a/src/plextrac b/src/plextrac index ddb8a09..35cf5de 100755 --- a/src/plextrac +++ b/src/plextrac @@ -1,7 +1,7 @@ #!/bin/bash set -Eeuo pipefail -VERSION=0.6.10 +VERSION=0.6.11 ## Podman Global Declaration Variable declare -A svcValues