LeadMagnet/leadchat
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

fix: Fix and rename pg_database_url.sh helper script (#2747)

Browse Source 
- Fix and rename pg_database_url helper script
- Use single-quote and remove trailing whitespace
This commit is contained in:
Pascal Jufer
2021-08-03 19:26:55 +02:00
committed by GitHub
parent ab54d9c629
commit c37966744f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docker/entrypoints/helpers/pg_database_url.sh → docker/entrypoints/helpers/pg_database_url.rb
View File

@@ -5,6 +5,6 @@ require 'uri'
if !ENV['DATABASE_URL'].nil? && ENV['DATABASE_URL'] != '' if !ENV['DATABASE_URL'].nil? && ENV['DATABASE_URL'] != ''
uri = URI(ENV['DATABASE_URL']) uri = URI(ENV['DATABASE_URL'])
puts "export POSTGRES_HOST=#{uri.host} POSTGRES_PORT=#{uri.port} POSTGRES_USERNAME=#{uri.user}" puts "export POSTGRES_HOST=#{uri.host} POSTGRES_PORT=#{uri.port} POSTGRES_USERNAME=#{uri.user}"
elif ENV['POSTGRES_PORT'].nil? || ENV['POSTGRES_PORT'] == '' elsif ENV['POSTGRES_PORT'].nil? || ENV['POSTGRES_PORT'] == ''
puts "export POSTGRES_PORT=5432" puts 'export POSTGRES_PORT=5432'
end end

2
docker/entrypoints/rails.sh
View File

@@ -10,7 +10,7 @@ echo "Waiting for postgres to become ready...."
# Let DATABASE_URL env take presedence over individual connection params. # Let DATABASE_URL env take presedence over individual connection params.
# This is done to avoid printing the DATABASE_URL in the logs # This is done to avoid printing the DATABASE_URL in the logs
$(docker/entrypoints/helpers/pg_database_url.sh) $(docker/entrypoints/helpers/pg_database_url.rb)
PG_READY="pg_isready -h $POSTGRES_HOST -p $POSTGRES_PORT -U $POSTGRES_USERNAME" PG_READY="pg_isready -h $POSTGRES_HOST -p $POSTGRES_PORT -U $POSTGRES_USERNAME"
until $PG_READY until $PG_READY