Skip to content

fix: support postgressql access via docker exec when psql client not installed #11512

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lakshmimsft merged 2 commits into from
Apr 13, 2026
+183 −149
Merged

fix: support postgressql access via docker exec when psql client not installed #11512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af68d67
support postgressql access via docker exec when psql client not insta…
lakshmimsft Mar 25, 2026
dfe0471
addressing copilt items
lakshmimsft Mar 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 21 additions & 17 deletions build/debug.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ DEBUG_DEV_ROOT ?= $(PWD)/debug_files
# PostgreSQL connection - Try Docker first (postgres user), fallback to local user
POSTGRES_ADMIN_CONNECTION ?= postgresql://postgres:radius_pass@localhost:5432/postgres
POSTGRES_FALLBACK_CONNECTION ?= postgresql://$(shell whoami)@localhost:5432/postgres
POSTGRES_CONTAINER_NAME ?= radius-postgres

.PHONY: debug-setup debug-start debug-stop debug-status debug-help debug-build-all debug-build-ucpd debug-build-applications-rp debug-build-controller debug-build-dynamic-rp debug-build-rad debug-deployment-engine-pull debug-deployment-engine-start debug-deployment-engine-deploy debug-deployment-engine-port-forward debug-deployment-engine-stop debug-deployment-engine-status debug-deployment-engine-logs debug-register-recipes debug-env-init debug-check-prereqs

Expand Down Expand Up @@ -121,28 +122,31 @@ debug-check-prereqs: ## Check if all required tools are installed for debugging
echo " terraform: https://learn.hashicorp.com/tutorials/terraform/install-cli"; \
exit 1; \
fi; \
if ! command -v psql >/dev/null 2>&1; then \
echo "❌ psql not available - PostgreSQL client is required"; \
exit 1; \
fi; \
echo "🔍 Checking PostgreSQL connectivity..."; \
if psql "$(POSTGRES_ADMIN_CONNECTION)" -c "SELECT 1;" >/dev/null 2>&1; then \
echo "✅ PostgreSQL accessible via Docker (postgres user)"; \
elif psql "$(POSTGRES_FALLBACK_CONNECTION)" -c "SELECT 1;" >/dev/null 2>&1; then \
echo "✅ PostgreSQL accessible via local user ($(shell whoami))"; \
if command -v psql >/dev/null 2>&1; then \
if psql "$(POSTGRES_ADMIN_CONNECTION)" -c "SELECT 1;" >/dev/null 2>&1; then \
echo "✅ PostgreSQL accessible via local psql (Docker connection)"; \
elif psql "$(POSTGRES_FALLBACK_CONNECTION)" -c "SELECT 1;" >/dev/null 2>&1; then \
echo "✅ PostgreSQL accessible via local psql (local user)"; \
elif docker exec $(POSTGRES_CONTAINER_NAME) psql -U postgres -c "SELECT 1;" >/dev/null 2>&1; then \
echo "✅ PostgreSQL accessible via Docker container ($(POSTGRES_CONTAINER_NAME))"; \
else \
echo "❌ psql found but cannot connect to PostgreSQL"; \
echo " Quick start: docker run --name $(POSTGRES_CONTAINER_NAME) -e POSTGRES_PASSWORD=radius_pass -p 5432:5432 -d postgres:15"; \
exit 1; \
fi; \
elif docker exec $(POSTGRES_CONTAINER_NAME) psql -U postgres -c "SELECT 1;" >/dev/null 2>&1; then \
echo "✅ PostgreSQL accessible via Docker container ($(POSTGRES_CONTAINER_NAME))"; \
else \
echo "❌ Cannot connect to PostgreSQL"; \
echo " Please ensure:"; \
echo " 1. PostgreSQL is running on localhost:5432"; \
echo " 2. Either Docker PostgreSQL (postgres/radius_pass) or local user access"; \
echo " 3. Quick start: docker run --name radius-postgres -e POSTGRES_PASSWORD=radius_pass -p 5432:5432 -d postgres:15"; \
echo " No local psql client found and Docker container '$(POSTGRES_CONTAINER_NAME)' is not running."; \
echo ""; \
echo " macOS (homebrew): brew services start postgresql"; \
echo " macOS manual: pg_ctl -D /opt/homebrew/var/postgres start"; \
echo " Linux (systemd): sudo systemctl start postgresql"; \
echo " Option 1 (recommended): Start PostgreSQL in Docker:"; \
echo " docker run --name $(POSTGRES_CONTAINER_NAME) -e POSTGRES_PASSWORD=radius_pass -p 5432:5432 -d postgres:15"; \
echo ""; \
echo " Quick one-off (Docker) alternative:"; \
echo " docker run --name radius-postgres -e POSTGRES_PASSWORD=radius_pass -p 5432:5432 -d postgres:15"; \
echo " Option 2: Install psql client and start a local PostgreSQL:"; \
echo " macOS (homebrew): brew install postgresql && brew services start postgresql"; \
echo " Linux (systemd): sudo systemctl start postgresql"; \
echo ""; \
echo " After starting, re-run: make debug-check-prereqs"; \
exit 1; \
Expand Down
258 changes: 135 additions & 123 deletions build/scripts/start-radius.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# PostgreSQL connection strings - try Docker first, then Homebrew local
POSTGRES_DOCKER_CONNECTION="postgresql://postgres:radius_pass@localhost:5432/postgres"
POSTGRES_HOMEBREW_CONNECTION="postgres"
POSTGRES_CONTAINER_NAME="radius-postgres"
Comment thread
sylvainsf marked this conversation as resolved.
set -e

# Get the script directory and repository root
Expand All @@ -23,29 +24,43 @@ print_warning() { echo -e "${YELLOW}⚠${NC} $1"; }
print_error() { echo -e "${RED}✗${NC} $1"; }

# Helper function to execute PostgreSQL commands with proper connection
# Tries: 1) local psql with Docker connection, 2) local psql with fallback connection (current user on localhost), 3) docker exec
psql_exec() {
local sql="$1"
if psql "$POSTGRES_DOCKER_CONNECTION" -c "$sql" >/dev/null 2>&1; then
return 0
elif psql "$POSTGRES_HOMEBREW_CONNECTION" -c "$sql" >/dev/null 2>&1; then
if command -v psql >/dev/null 2>&1; then
if psql "$POSTGRES_DOCKER_CONNECTION" -c "$sql" >/dev/null 2>&1; then
return 0
elif psql "$POSTGRES_HOMEBREW_CONNECTION" -c "$sql" >/dev/null 2>&1; then
return 0
fi
fi
if docker exec "$POSTGRES_CONTAINER_NAME" psql -U postgres -c "$sql" >/dev/null 2>&1; then
return 0
else
return 1
fi
return 1
}

# Helper function to determine which PostgreSQL connection is working
detect_postgres_connection() {
if psql "$POSTGRES_DOCKER_CONNECTION" -c "SELECT 1;" >/dev/null 2>&1; then
echo "docker"
export POSTGRES_WORKING_CONNECTION="$POSTGRES_DOCKER_CONNECTION"
elif psql "$POSTGRES_HOMEBREW_CONNECTION" -c "SELECT 1;" >/dev/null 2>&1; then
echo "homebrew"
export POSTGRES_WORKING_CONNECTION="$POSTGRES_HOMEBREW_CONNECTION"
else
echo "none"
if command -v psql >/dev/null 2>&1; then
if psql "$POSTGRES_DOCKER_CONNECTION" -c "SELECT 1;" >/dev/null 2>&1; then
echo "docker"
export POSTGRES_WORKING_CONNECTION="$POSTGRES_DOCKER_CONNECTION"
return
elif psql "$POSTGRES_HOMEBREW_CONNECTION" -c "SELECT 1;" >/dev/null 2>&1; then
echo "homebrew"
export POSTGRES_WORKING_CONNECTION="$POSTGRES_HOMEBREW_CONNECTION"
return
fi
fi
if docker exec "$POSTGRES_CONTAINER_NAME" psql -U postgres -c "SELECT 1;" >/dev/null 2>&1 \
&& docker port "$POSTGRES_CONTAINER_NAME" 5432/tcp >/dev/null 2>&1; then
echo "docker-exec"
export POSTGRES_WORKING_CONNECTION=""
return
Comment thread
lakshmimsft marked this conversation as resolved.
fi
echo "none"
export POSTGRES_WORKING_CONNECTION=""
}

check_prerequisites() {
Expand All @@ -60,16 +75,27 @@ check_prerequisites() {
command -v kubectl >/dev/null 2>&1 || missing_tools+=("kubectl -> https://kubernetes.io/docs/tasks/tools/")
command -v terraform >/dev/null 2>&1 || missing_tools+=("terraform -> https://developer.hashicorp.com/terraform/install")
if ! command -v psql >/dev/null 2>&1; then
missing_tools+=("psql (PostgreSQL client) -> https://www.postgresql.org/download/")
if docker exec "$POSTGRES_CONTAINER_NAME" psql -U postgres -c "SELECT 1;" >/dev/null 2>&1; then
if docker port "$POSTGRES_CONTAINER_NAME" 5432/tcp >/dev/null 2>&1; then
print_info "PostgreSQL accessible via Docker container ($POSTGRES_CONTAINER_NAME)"
else
advisory_msgs+=("PostgreSQL running in Docker container '$POSTGRES_CONTAINER_NAME' but port 5432 is not published. Ensure port is published: docker run --name radius-postgres -e POSTGRES_PASSWORD=radius_pass -p 5432:5432 -d postgres:15")
fi
else
advisory_msgs+=("psql client not found and Docker container '$POSTGRES_CONTAINER_NAME' not running. Quick start: docker run --name radius-postgres -e POSTGRES_PASSWORD=radius_pass -p 5432:5432 -d postgres:15")
fi
else
postgres_type=$(detect_postgres_connection)
case $postgres_type in
"docker")
print_info "PostgreSQL accessible via Docker (postgres user)"
print_info "PostgreSQL accessible via local psql (Docker connection)"
;;
"homebrew")
print_info "PostgreSQL accessible via Homebrew (local user)"
;;
"docker-exec")
print_info "PostgreSQL accessible via Docker container ($POSTGRES_CONTAINER_NAME)"
;;
"none")
advisory_msgs+=("PostgreSQL not reachable. Quick start: docker run --name radius-postgres -e POSTGRES_PASSWORD=radius_pass -p 5432:5432 -d postgres:15")
;;
Expand Down Expand Up @@ -150,120 +176,106 @@ mkdir -p "$DEBUG_ROOT/logs"

# Initialize PostgreSQL database if needed
echo "🗄️ Initializing PostgreSQL database (idempotent)..."
if command -v psql >/dev/null 2>&1; then
# Detect which PostgreSQL connection is working
postgres_type=$(detect_postgres_connection)
# Manually set the working connection based on the type
if [ "$postgres_type" = "docker" ]; then
POSTGRES_WORKING_CONNECTION="$POSTGRES_DOCKER_CONNECTION"
elif [ "$postgres_type" = "homebrew" ]; then
POSTGRES_WORKING_CONNECTION="$POSTGRES_HOMEBREW_CONNECTION"
else
POSTGRES_WORKING_CONNECTION=""
fi
if [ "$postgres_type" = "none" ]; then
print_error "Cannot connect to PostgreSQL"
echo "Troubleshooting:"
echo " - macOS: brew services start postgresql"
echo " - Linux: sudo systemctl start postgresql"
echo " - Or run disposable container: docker run --name radius-postgres -e POSTGRES_PASSWORD=radius_pass -p 5432:5432 -d postgres:15"
echo "Re-run: make debug-start"
echo "Docs: docs/contributing/contributing-code/contributing-code-debugging/radius-os-processes-debugging.md#prerequisites"
exit 1
fi

# Create applications_rp user if it doesn't exist
if ! psql_exec "CREATE USER applications_rp WITH PASSWORD 'radius_pass';"; then
echo "(applications_rp user exists)"
else
echo "Created user applications_rp"
fi
if ! psql_exec "CREATE DATABASE applications_rp OWNER applications_rp;"; then
echo "(applications_rp database exists)"
else
echo "Created database applications_rp"
fi

# Grant privileges
psql_exec "GRANT ALL PRIVILEGES ON DATABASE applications_rp TO applications_rp;" || true

# Create the resources table in applications_rp database using the working connection
if [ "$postgres_type" = "docker" ]; then
applications_rp_connection=$(echo "$POSTGRES_WORKING_CONNECTION" | sed 's|/postgres$|/applications_rp|')
else
applications_rp_connection="applications_rp"
fi

if psql "$applications_rp_connection" -c "
CREATE TABLE IF NOT EXISTS resources (
id TEXT PRIMARY KEY NOT NULL,
original_id TEXT NOT NULL,
resource_type TEXT NOT NULL,
root_scope TEXT NOT NULL,
routing_scope TEXT NOT NULL,
etag TEXT NOT NULL,
created_at timestamp(6) with time zone DEFAULT CURRENT_TIMESTAMP,
resource_data jsonb NOT NULL
);
CREATE INDEX IF NOT EXISTS idx_resource_query ON resources (resource_type, root_scope);

-- Grant table-level permissions to the applications_rp user
GRANT ALL PRIVILEGES ON TABLE resources TO applications_rp;
GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA public TO applications_rp;
"; then
echo "✅ applications_rp tables created/verified"
else
print_warning "Could not verify/create applications_rp tables"
fi

# Also create UCP database for completeness
if ! psql_exec "CREATE USER ucp WITH PASSWORD 'radius_pass';"; then
echo "(ucp user exists)"
else
echo "Created user ucp"
fi
if ! psql_exec "CREATE DATABASE ucp OWNER ucp;"; then
echo "(ucp database exists)"
else
echo "Created database ucp"
fi
psql_exec "GRANT ALL PRIVILEGES ON DATABASE ucp TO ucp;" || true

# Create the resources table in ucp database using the working connection
if [ "$postgres_type" = "docker" ]; then
ucp_connection=$(echo "$POSTGRES_WORKING_CONNECTION" | sed 's|/postgres$|/ucp|')
else
ucp_connection="postgresql://ucp:radius_pass@localhost:5432/ucp"
fi

if psql "$ucp_connection" -c "
CREATE TABLE IF NOT EXISTS resources (
id TEXT PRIMARY KEY NOT NULL,
original_id TEXT NOT NULL,
resource_type TEXT NOT NULL,
root_scope TEXT NOT NULL,
routing_scope TEXT NOT NULL,
etag TEXT NOT NULL,
created_at timestamp(6) with time zone DEFAULT CURRENT_TIMESTAMP,
resource_data jsonb NOT NULL
);
CREATE INDEX IF NOT EXISTS idx_resource_query ON resources (resource_type, root_scope);

-- Grant table-level permissions to the ucp user
GRANT ALL PRIVILEGES ON TABLE resources TO ucp;
GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA public TO ucp;
"; then
echo "✅ UCP tables created/verified"

# Detect which PostgreSQL connection is working
postgres_type=$(detect_postgres_connection)
# Manually set the working connection based on the type
if [ "$postgres_type" = "docker" ]; then
POSTGRES_WORKING_CONNECTION="$POSTGRES_DOCKER_CONNECTION"
elif [ "$postgres_type" = "homebrew" ]; then
POSTGRES_WORKING_CONNECTION="$POSTGRES_HOMEBREW_CONNECTION"
else
POSTGRES_WORKING_CONNECTION=""
fi

if [ "$postgres_type" = "none" ]; then
print_error "Cannot connect to PostgreSQL"
echo "Troubleshooting:"
echo " - Start Docker container: docker run --name radius-postgres -e POSTGRES_PASSWORD=radius_pass -p 5432:5432 -d postgres:15"
echo " - macOS: brew services start postgresql"
echo " - Linux: sudo systemctl start postgresql"
echo "Re-run: make debug-start"
echo "Docs: docs/contributing/contributing-code/contributing-code-debugging/radius-os-processes-debugging.md#prerequisites"
exit 1
fi

# Create applications_rp user if it doesn't exist
if ! psql_exec "CREATE USER applications_rp WITH PASSWORD 'radius_pass';"; then
echo "(applications_rp user exists)"
else
echo "Created user applications_rp"
fi
if ! psql_exec "CREATE DATABASE applications_rp OWNER applications_rp;"; then
echo "(applications_rp database exists)"
else
echo "Created database applications_rp"
fi

# Grant privileges
psql_exec "GRANT ALL PRIVILEGES ON DATABASE applications_rp TO applications_rp;" || true

# Also create UCP database for completeness
if ! psql_exec "CREATE USER ucp WITH PASSWORD 'radius_pass';"; then
echo "(ucp user exists)"
else
echo "Created user ucp"
fi
if ! psql_exec "CREATE DATABASE ucp OWNER ucp;"; then
echo "(ucp database exists)"
else
echo "Created database ucp"
fi
psql_exec "GRANT ALL PRIVILEGES ON DATABASE ucp TO ucp;" || true

# Helper: create the resources table and grant permissions in a given database
# Usage: init_db_tables <db_name> <db_user>
init_db_tables() {
local db="$1"
local db_user="$2"
local table_sql="
CREATE TABLE IF NOT EXISTS resources (
id TEXT PRIMARY KEY NOT NULL,
original_id TEXT NOT NULL,
resource_type TEXT NOT NULL,
root_scope TEXT NOT NULL,
routing_scope TEXT NOT NULL,
etag TEXT NOT NULL,
created_at timestamp(6) with time zone DEFAULT CURRENT_TIMESTAMP,
resource_data jsonb NOT NULL
);
CREATE INDEX IF NOT EXISTS idx_resource_query ON resources (resource_type, root_scope);
GRANT ALL PRIVILEGES ON TABLE resources TO ${db_user};
GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA public TO ${db_user};
"

if [ "$postgres_type" = "docker-exec" ]; then
docker exec "$POSTGRES_CONTAINER_NAME" psql -U postgres -d "$db" -c "$table_sql"
elif [ "$postgres_type" = "docker" ]; then
local conn
conn=$(echo "$POSTGRES_WORKING_CONNECTION" | sed "s|/postgres\$|/${db}|")
psql "$conn" -c "$table_sql"
else
print_warning "Could not verify/create UCP tables"
# Homebrew/local: use bare database name for peer auth compatibility
psql "$db" -c "$table_sql"
fi

print_success "Database initialization complete (idempotent)"
}

if init_db_tables "applications_rp" "applications_rp"; then
echo "✅ applications_rp tables created/verified"
else
print_error "psql not available - database cannot be initialized"
print_error "Could not create applications_rp tables - database cannot be initialized"
exit 1
fi

if init_db_tables "ucp" "ucp"; then
echo "✅ UCP tables created/verified"
else
print_error "Could not create UCP tables - database cannot be initialized"
exit 1
fi

print_success "Database initialization complete (idempotent)"

# Start UCP with dlv
echo "Starting UCP with dlv on port 40001..."
dlv exec "$DEBUG_ROOT/bin/ucpd" --listen=127.0.0.1:40001 --headless=true --api-version=2 --accept-multiclient --continue -- --config-file="$SCRIPT_DIR/../configs/ucp.yaml" > "$DEBUG_ROOT/logs/ucp.log" 2>&1 &
Expand Down
Loading
Loading