Commit 716955fb authored Oct 20, 2022 by Shinya Maeda

Merge branch 'z.linha-master-patch-77411' into 'master'

fix: no auto_database_url when postgres not enabled

See merge request https://gitlab.com/gitlab-org/cluster-integration/auto-deploy-image/-/merge_requests/289



Merged-by: Shinya Maeda <shinya@gitlab.com>
Approved-by: Bala Kumar <sbalakumar@gitlab.com>
Approved-by: Shinya Maeda <shinya@gitlab.com>
Co-authored-by: Thiago Linhares <z.linha@gmail.com>

parents dcff996a 1269291f

src/bin/auto-deploy

+3 −1

Original line number	Diff line number	Diff line
		@@ -155,7 +155,9 @@ function persist_environment_url() {

		function auto_database_url() {
		local auto_database_url
		if [[ "$POSTGRES_ENABLED" == "true" ]]; then
		auto_database_url="postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRESQL_RELEASE_NAME}:5432/${POSTGRES_DB}"
		fi

		echo "${DATABASE_URL-$auto_database_url}"
		}