Merge pull request #521 from jonathankingfc/master

move pipefail outside of pg_dump block
sclorg · Jul 21, 2023 · 6a32fc1 · 6a32fc1
2 parents b20805e + 3a516df
commit 6a32fc1
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 6 deletions.
diff --git a/10/root/usr/share/container-scripts/postgresql/common.sh b/10/root/usr/share/container-scripts/postgresql/common.sh
@@ -248,9 +248,9 @@ migrate_db ()
 {
  test "$postinitdb_actions" = ",migration" || return 0
 
+ set -o pipefail
  # Migration path.
  (
- set -o pipefail
  if [ ${POSTGRESQL_MIGRATION_IGNORE_ERRORS-no} = no ]; then
  echo '\set ON_ERROR_STOP on'
  fi
@@ -260,6 +260,7 @@ migrate_db ()
  pg_dumpall -h "$POSTGRESQL_MIGRATION_REMOTE_HOST" \
  | grep -v '^CREATE ROLE postgres;'
  ) | psql
+ set +o pipefail
 }
 
 function set_pgdata ()

diff --git a/12/root/usr/share/container-scripts/postgresql/common.sh b/12/root/usr/share/container-scripts/postgresql/common.sh
@@ -248,9 +248,9 @@ migrate_db ()
 {
  test "$postinitdb_actions" = ",migration" || return 0
 
+ set -o pipefail
  # Migration path.
  (
- set -o pipefail
  if [ ${POSTGRESQL_MIGRATION_IGNORE_ERRORS-no} = no ]; then
  echo '\set ON_ERROR_STOP on'
  fi
@@ -260,6 +260,7 @@ migrate_db ()
  pg_dumpall -h "$POSTGRESQL_MIGRATION_REMOTE_HOST" \
  | grep -v '^CREATE ROLE postgres;'
  ) | psql
+ set +o pipefail
 }
 
 function set_pgdata ()

diff --git a/13/root/usr/share/container-scripts/postgresql/common.sh b/13/root/usr/share/container-scripts/postgresql/common.sh
@@ -248,9 +248,9 @@ migrate_db ()
 {
  test "$postinitdb_actions" = ",migration" || return 0
 
+ set -o pipefail
  # Migration path.
  (
- set -o pipefail
  if [ ${POSTGRESQL_MIGRATION_IGNORE_ERRORS-no} = no ]; then
  echo '\set ON_ERROR_STOP on'
  fi
@@ -260,6 +260,7 @@ migrate_db ()
  pg_dumpall -h "$POSTGRESQL_MIGRATION_REMOTE_HOST" \
  | grep -v '^CREATE ROLE postgres;'
  ) | psql
+ set +o pipefail
 }
 
 function set_pgdata ()

diff --git a/14/root/usr/share/container-scripts/postgresql/common.sh b/14/root/usr/share/container-scripts/postgresql/common.sh
@@ -248,9 +248,9 @@ migrate_db ()
 {
  test "$postinitdb_actions" = ",migration" || return 0
 
+ set -o pipefail
  # Migration path.
  (
- set -o pipefail
  if [ ${POSTGRESQL_MIGRATION_IGNORE_ERRORS-no} = no ]; then
  echo '\set ON_ERROR_STOP on'
  fi
@@ -260,6 +260,7 @@ migrate_db ()
  pg_dumpall -h "$POSTGRESQL_MIGRATION_REMOTE_HOST" \
  | grep -v '^CREATE ROLE postgres;'
  ) | psql
+ set +o pipefail
 }
 
 function set_pgdata ()

diff --git a/15/root/usr/share/container-scripts/postgresql/common.sh b/15/root/usr/share/container-scripts/postgresql/common.sh
@@ -248,9 +248,9 @@ migrate_db ()
 {
  test "$postinitdb_actions" = ",migration" || return 0
 
+ set -o pipefail
  # Migration path.
  (
- set -o pipefail
  if [ ${POSTGRESQL_MIGRATION_IGNORE_ERRORS-no} = no ]; then
  echo '\set ON_ERROR_STOP on'
  fi
@@ -260,6 +260,7 @@ migrate_db ()
  pg_dumpall -h "$POSTGRESQL_MIGRATION_REMOTE_HOST" \
  | grep -v '^CREATE ROLE postgres;'
  ) | psql
+ set +o pipefail
 }
 
 function set_pgdata ()

diff --git a/src/root/usr/share/container-scripts/postgresql/common.sh b/src/root/usr/share/container-scripts/postgresql/common.sh
@@ -249,9 +249,9 @@ migrate_db ()
 {
  test "$postinitdb_actions" = ",migration" || return 0
 
+ set -o pipefail
  # Migration path.
  (
- set -o pipefail
  if [ ${POSTGRESQL_MIGRATION_IGNORE_ERRORS-no} = no ]; then
  echo '\set ON_ERROR_STOP on'
  fi
@@ -261,6 +261,7 @@ migrate_db ()
  pg_dumpall -h "$POSTGRESQL_MIGRATION_REMOTE_HOST" \
  | grep -v '^CREATE ROLE postgres;'
  ) | psql
+ set +o pipefail
 }
 
 function set_pgdata ()