upgrade-postgresql: Swap order of cleanup steps in trap.

alexmv · timabbott · commit 8823d783a4e6 · 2023-02-21T10:17:36.000-08:00
We need to remove the container before removing the volume, otherwise
the cleanup will fail because the volume is in use.
diff --git a/upgrade-postgresql b/upgrade-postgresql
@@ -57,7 +57,7 @@ temp_container=$(
 		--health-interval 10s \
 		"zulip/zulip-postgresql:$new_version"
 )
-trap 'docker volume rm --force "$full_new_volume"; docker rm --force "$temp_container"' EXIT
+trap 'docker rm --force "$temp_container"; docker volume rm --force "$full_new_volume"' EXIT
 
 # Wait for the new PostgreSQL container to become available
 tries=0

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ temp_container=$(`
`57`	`57`	`--health-interval 10s \`
`58`	`58`	`"zulip/zulip-postgresql:$new_version"`
`59`	`59`	`)`
`60`		`-trap 'docker volume rm --force "$full_new_volume"; docker rm --force "$temp_container"' EXIT`
	`60`	`+trap 'docker rm --force "$temp_container"; docker volume rm --force "$full_new_volume"' EXIT`
`61`	`61`
`62`	`62`	`# Wait for the new PostgreSQL container to become available`
`63`	`63`	`tries=0`