mirror of
https://github.com/oven-sh/bun
synced 2026-02-02 15:08:46 +00:00
a394063a7d
## Summary - Refactors `tls-sql.test.ts` to use `describeWithContainer` with a local Docker container instead of external Neon secrets - Updates `postgres_tls` service to build from Dockerfile (fixes SSL key permission issues) - Fixes pg_hba.conf to allow local socket connections for init scripts ## Test plan - [x] Verified tests pass locally with `bun bd test test/js/sql/tls-sql.test.ts` (30 tests pass) - [ ] CI passes on x64 Linux (arm64 Docker tests are currently disabled) 🤖 Generated with [Claude Code](https://claude.com/claude-code) --------- Co-authored-by: Claude Bot <claude-bot@bun.sh> Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
83 lines
3.7 KiB
Docker
83 lines
3.7 KiB
Docker
# Dockerfile
|
|
FROM postgres:15.13
|
|
|
|
# Create directory for SSL certificates
|
|
RUN mkdir -p /etc/postgresql/ssl
|
|
|
|
# Copy existing certificates
|
|
COPY server.key server.crt /etc/postgresql/ssl/
|
|
RUN chmod 600 /etc/postgresql/ssl/server.key && \
|
|
chown postgres:postgres /etc/postgresql/ssl/server.key /etc/postgresql/ssl/server.crt
|
|
|
|
# Create initialization script
|
|
RUN echo '#!/bin/bash\n\
|
|
set -e\n\
|
|
\n\
|
|
# Wait for PostgreSQL to start\n\
|
|
until pg_isready; do\n\
|
|
echo "Waiting for PostgreSQL to start..."\n\
|
|
sleep 1\n\
|
|
done\n\
|
|
\n\
|
|
dropdb --if-exists bun_sql_test\n\
|
|
\n\
|
|
# Drop and recreate users with different auth methods\n\
|
|
psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL\n\
|
|
DROP USER IF EXISTS bun_sql_test;\n\
|
|
CREATE USER bun_sql_test;\n\
|
|
\n\
|
|
ALTER SYSTEM SET password_encryption = '"'"'md5'"'"';\n\
|
|
SELECT pg_reload_conf();\n\
|
|
DROP USER IF EXISTS bun_sql_test_md5;\n\
|
|
CREATE USER bun_sql_test_md5 WITH PASSWORD '"'"'bun_sql_test_md5'"'"';\n\
|
|
\n\
|
|
ALTER SYSTEM SET password_encryption = '"'"'scram-sha-256'"'"';\n\
|
|
SELECT pg_reload_conf();\n\
|
|
DROP USER IF EXISTS bun_sql_test_scram;\n\
|
|
CREATE USER bun_sql_test_scram WITH PASSWORD '"'"'bun_sql_test_scram'"'"';\n\
|
|
EOSQL\n\
|
|
\n\
|
|
# Create database and set permissions\n\
|
|
createdb bun_sql_test\n\
|
|
\n\
|
|
psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL\n\
|
|
GRANT ALL ON DATABASE bun_sql_test TO bun_sql_test;\n\
|
|
ALTER DATABASE bun_sql_test OWNER TO bun_sql_test;\n\
|
|
EOSQL\n\
|
|
' > /docker-entrypoint-initdb.d/init-users-db.sh
|
|
|
|
# Make the script executable
|
|
RUN chmod +x /docker-entrypoint-initdb.d/init-users-db.sh
|
|
|
|
# Create pg_hba.conf with SSL requirements
|
|
RUN mkdir -p /etc/postgresql && touch /etc/postgresql/pg_hba.conf && \
|
|
echo "# Allow local socket connections for init scripts" >> /etc/postgresql/pg_hba.conf && \
|
|
echo "local all postgres trust" >> /etc/postgresql/pg_hba.conf && \
|
|
echo "local all all trust" >> /etc/postgresql/pg_hba.conf && \
|
|
echo "# Remote TLS connections" >> /etc/postgresql/pg_hba.conf && \
|
|
echo "hostssl all postgres 0.0.0.0/0 trust" >> /etc/postgresql/pg_hba.conf && \
|
|
echo "hostssl all bun_sql_test 0.0.0.0/0 trust" >> /etc/postgresql/pg_hba.conf && \
|
|
echo "hostssl all bun_sql_test_md5 0.0.0.0/0 md5" >> /etc/postgresql/pg_hba.conf && \
|
|
echo "hostssl all bun_sql_test_scram 0.0.0.0/0 scram-sha-256" >> /etc/postgresql/pg_hba.conf && \
|
|
echo "hostssl all postgres ::/0 trust" >> /etc/postgresql/pg_hba.conf && \
|
|
echo "hostssl all bun_sql_test ::/0 trust" >> /etc/postgresql/pg_hba.conf && \
|
|
echo "hostssl all bun_sql_test_md5 ::/0 md5" >> /etc/postgresql/pg_hba.conf && \
|
|
echo "hostssl all bun_sql_test_scram ::/0 scram-sha-256" >> /etc/postgresql/pg_hba.conf && \
|
|
echo "hostssl replication all 0.0.0.0/0 trust" >> /etc/postgresql/pg_hba.conf && \
|
|
echo "hostssl replication all ::/0 trust" >> /etc/postgresql/pg_hba.conf && \
|
|
echo "host all all all reject" >> /etc/postgresql/pg_hba.conf
|
|
|
|
# Configure PostgreSQL for SSL
|
|
RUN mkdir -p /docker-entrypoint-initdb.d && \
|
|
echo "ALTER SYSTEM SET max_prepared_transactions = '100';" > /docker-entrypoint-initdb.d/configure-postgres.sql && \
|
|
echo "ALTER SYSTEM SET ssl = 'on';" >> /docker-entrypoint-initdb.d/configure-postgres.sql && \
|
|
echo "ALTER SYSTEM SET ssl_cert_file = '/etc/postgresql/ssl/server.crt';" >> /docker-entrypoint-initdb.d/configure-postgres.sql && \
|
|
echo "ALTER SYSTEM SET ssl_key_file = '/etc/postgresql/ssl/server.key';" >> /docker-entrypoint-initdb.d/configure-postgres.sql
|
|
|
|
# Set environment variables
|
|
ENV POSTGRES_HOST_AUTH_METHOD=trust
|
|
ENV POSTGRES_USER=postgres
|
|
|
|
# Expose PostgreSQL port
|
|
EXPOSE 5432
|