diff --git a/13.0/pre_upgrade.sh b/13.0/pre_upgrade.sh index 6a9d933..918dd2d 100755 --- a/13.0/pre_upgrade.sh +++ b/13.0/pre_upgrade.sh @@ -3,7 +3,7 @@ echo "Prepare migration to 13.0..." # Copy database -docker exec -u 70 "$DB_CONTAINER_NAME" pgm cp -f ou12 ou13@ou13 +copy_database ou12 ou13 ou13 || exit 1 # Execute SQL pre-migration commands PRE_MIGRATE_SQL=$(cat <<'EOF' diff --git a/14.0/pre_upgrade.sh b/14.0/pre_upgrade.sh index 77c37ea..81048d5 100755 --- a/14.0/pre_upgrade.sh +++ b/14.0/pre_upgrade.sh @@ -3,7 +3,7 @@ echo "Prepare migration to 14.0..." # Copy database -docker exec -u 70 "$DB_CONTAINER_NAME" pgm cp -f ou13 ou14@ou14 +copy_database ou13 ou14 ou14 || exit 1 # Execute SQL pre-migration commands PRE_MIGRATE_SQL="" diff --git a/15.0/pre_upgrade.sh b/15.0/pre_upgrade.sh index 59a9348..ced1d87 100755 --- a/15.0/pre_upgrade.sh +++ b/15.0/pre_upgrade.sh @@ -3,7 +3,7 @@ echo "Prepare migration to 15.0..." # Copy database -docker exec -u 70 "$DB_CONTAINER_NAME" pgm cp -f ou14 ou15@ou15 +copy_database ou14 ou15 ou15 || exit 1 # Execute SQL pre-migration commands PRE_MIGRATE_SQL=$(cat <<'EOF' diff --git a/16.0/pre_upgrade.sh b/16.0/pre_upgrade.sh index b248ef1..051e83f 100755 --- a/16.0/pre_upgrade.sh +++ b/16.0/pre_upgrade.sh @@ -3,7 +3,7 @@ echo "Prepare migration to 16.0..." # Copy database -docker exec -u 70 "$DB_CONTAINER_NAME" pgm cp -f ou15 ou16@ou16 +copy_database ou15 ou16 ou16 || exit 1 # Execute SQL pre-migration commands PRE_MIGRATE_SQL=$(cat <<'EOF' diff --git a/upgrade.sh b/upgrade.sh index 2990b3b..4c9684a 100755 --- a/upgrade.sh +++ b/upgrade.sh @@ -61,6 +61,15 @@ query_postgres_container(){ } export -f query_postgres_container +# Function to copy the postgres databases +copy_database(){ + local FROM_DB="$1" + local TO_SERVICE="$2" + local TO_DB="$3" + docker exec -u 70 "$POSTGRES_SERVICE_NAME" pgm cp -f "$FROM_DB" "$TO_DB"@"$TO_SERVICE" +} +export -f copy_database + # Function to copy the filetores copy_filestore(){ local FROM_SERVICE="$1" @@ -126,7 +135,7 @@ echo " echo "UPGRADE: Start copy" # Copy database -docker exec -u 70 $POSTGRES_SERVICE_NAME pgm cp -f "$ORIGIN_DB_NAME" "${COPY_DB_NAME}@${COPY_DB_NAME}" || exit 1 +copy_database "$ORIGIN_DB_NAME" "$COPY_DB_NAME" "$COPY_DB_NAME" || exit 1 echo "UPGRADE: original database copied in ${COPY_DB_NAME}@${COPY_DB_NAME}." # Copy filestore