From e55210c332c737d75080c43000ea24d9c2f04b74 Mon Sep 17 00:00:00 2001 From: Brian O'Reilly Date: Sun, 7 Dec 2025 11:29:42 -0500 Subject: [PATCH] Source database auth creds from the environment Defaults to known values for development. source the environment credentials so they're available at container build. --- .gitignore | 1 + docker/docker-compose.yml | 6 +++--- docker/environment.sh | 10 ++++++++++ docker/start.sh | 3 +++ 4 files changed, 17 insertions(+), 3 deletions(-) create mode 100755 docker/environment.sh diff --git a/.gitignore b/.gitignore index 4d55b48..8793456 100644 --- a/.gitignore +++ b/.gitignore @@ -56,3 +56,4 @@ logs/ performance-logs/ # Temporary files +/static/asteroid.css diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 7ac49e0..c519e6c 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -35,9 +35,9 @@ services: image: postgres:16-alpine container_name: asteroid-postgres environment: - POSTGRES_DB: asteroid - POSTGRES_USER: asteroid - POSTGRES_PASSWORD: asteroid_db_2025 + - POSTGRES_DB=${ASTEROID_DB_NAME:-asteroid} + - POSTGRES_USER=${ASTEROID_DB_USER:-asteroid} + - POSTGRES_PASSWORD=${ASTEROID_DB_PASSWORD:-asteroid_db_2025} ports: - "5432:5432" volumes: diff --git a/docker/environment.sh b/docker/environment.sh new file mode 100755 index 0000000..f4bb297 --- /dev/null +++ b/docker/environment.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +export ASTEROID_STREAM_URL='http://ice.asteroid.radio' + +# source this file prior to starting the asteroid containers. Set the +# DB name and access params here. + +export ASTEROID_DB_NAME=asteroid +export ASTEROID_DB_USER=asteroid +export ASTEROID_DB_PASSWORD=asteroid_db_2025 diff --git a/docker/start.sh b/docker/start.sh index f46dd85..263c654 100755 --- a/docker/start.sh +++ b/docker/start.sh @@ -1,5 +1,8 @@ #!/bin/bash +# source our environment for credentials +. environment.sh + # Simple start script for Docker directory # Run from: /home/glenn/Projects/Code/asteroid/docker/