kevinsivic/dawarich
1
0
Fork 0
mirror of https://github.com/Freika/dawarich.git synced 2026-01-11 01:31:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 543242cdf3 into b4c2def2be

Browse source
This commit is contained in:
Aljoscha Grebe 2026-01-02 17:06:38 +01:00 committed by GitHub
commit 63fc8ca84e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 13 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
docker/sidekiq-entrypoint.sh
View file

@ -10,18 +10,11 @@ echo "⚠️ Starting Sidekiq in $RAILS_ENV environment ⚠️"
# Parse DATABASE_URL if present, otherwise use individual variables # Parse DATABASE_URL if present, otherwise use individual variables
if [ -n "$DATABASE_URL" ]; then if [ -n "$DATABASE_URL" ]; then
# Extract components from DATABASE_URL # Extract components from DATABASE_URL
DATABASE_HOST=$(echo $DATABASE_URL | awk -F[@/] '{print $4}') DATABASE_HOST="$(echo "$DATABASE_URL" | awk -F[@/] '{print $4}')"
DATABASE_PORT=$(echo $DATABASE_URL | awk -F[@/:] '{print $5}') DATABASE_PORT="$(echo "$DATABASE_URL" | awk -F[@/:] '{print $5}')"
DATABASE_USERNAME=$(echo $DATABASE_URL | awk -F[:/@] '{print $4}') DATABASE_USERNAME="$(echo "$DATABASE_URL" | awk -F[:/@] '{print $4}')"
DATABASE_PASSWORD=$(echo $DATABASE_URL | awk -F[:/@] '{print $5}') DATABASE_PASSWORD="$(echo "$DATABASE_URL" | awk -F[:/@] '{print $5}')"
DATABASE_NAME=$(echo $DATABASE_URL | awk -F[@/] '{print $5}') DATABASE_NAME="$(echo "$DATABASE_URL" | awk -F[@/] '{print $5}')"
else
# Use existing environment variables
DATABASE_HOST=${DATABASE_HOST}
DATABASE_PORT=${DATABASE_PORT}
DATABASE_USERNAME=${DATABASE_USERNAME}
DATABASE_PASSWORD=${DATABASE_PASSWORD}
DATABASE_NAME=${DATABASE_NAME}
fi fi
# Wait for the database to become available # Wait for the database to become available
@ -33,4 +26,4 @@ done
echo "✅ PostgreSQL is ready!" echo "✅ PostgreSQL is ready!"
# run sidekiq # run sidekiq
bundle exec sidekiq exec bundle exec sidekiq

21
docker/web-entrypoint.sh
View file

@ -10,18 +10,11 @@ echo "⚠️ Starting Rails environment: $RAILS_ENV ⚠️"
# Parse DATABASE_URL if present, otherwise use individual variables # Parse DATABASE_URL if present, otherwise use individual variables
if [ -n "$DATABASE_URL" ]; then if [ -n "$DATABASE_URL" ]; then
# Extract components from DATABASE_URL # Extract components from DATABASE_URL
DATABASE_HOST=$(echo $DATABASE_URL | awk -F[@/] '{print $4}') DATABASE_HOST="$(echo "$DATABASE_URL" | awk -F[@/] '{print $4}')"
DATABASE_PORT=$(echo $DATABASE_URL | awk -F[@/:] '{print $5}') DATABASE_PORT="$(echo "$DATABASE_URL" | awk -F[@/:] '{print $5}')"
DATABASE_USERNAME=$(echo $DATABASE_URL | awk -F[:/@] '{print $4}') DATABASE_USERNAME="$(echo "$DATABASE_URL" | awk -F[:/@] '{print $4}')"
DATABASE_PASSWORD=$(echo $DATABASE_URL | awk -F[:/@] '{print $5}') DATABASE_PASSWORD="$(echo "$DATABASE_URL" | awk -F[:/@] '{print $5}')"
DATABASE_NAME=$(echo $DATABASE_URL | awk -F[@/] '{print $5}') DATABASE_NAME="$(echo "$DATABASE_URL" | awk -F[@/] '{print $5}')"
else
# Use existing environment variables
DATABASE_HOST=${DATABASE_HOST}
DATABASE_PORT=${DATABASE_PORT}
DATABASE_USERNAME=${DATABASE_USERNAME}
DATABASE_PASSWORD=${DATABASE_PASSWORD}
DATABASE_NAME=${DATABASE_NAME}
fi fi
# Export main database variables to ensure they're available # Export main database variables to ensure they're available
@ -32,7 +25,7 @@ export DATABASE_PASSWORD
export DATABASE_NAME export DATABASE_NAME
# Remove pre-existing puma/passenger server.pid # Remove pre-existing puma/passenger server.pid
rm -f $APP_PATH/tmp/pids/server.pid rm -f "$APP_PATH/tmp/pids/server.pid"
# Sync static assets from image to volume # Sync static assets from image to volume
# This ensures new and updated files are copied to the persistent volume # This ensures new and updated files are copied to the persistent volume
@ -83,4 +76,4 @@ echo "Running seeds..."
bundle exec rails db:seed bundle exec rails db:seed
# run passed commands # run passed commands
bundle exec ${@} exec bundle exec "${@}"