fix: address review comments
CI / verify (pull_request) Successful in 4m16s

This commit is contained in:
2026-09-25 11:46:02 +03:00
parent 09779a53ae
commit 6d5ac9e81d
26 changed files with 683 additions and 666 deletions
+5 -5
View File
@@ -8,23 +8,23 @@ trap 'rm -f "$backup_file"' EXIT
started_at=$(date +%s)
docker compose exec -T postgres sh -eu -c '
export PGPASSWORD="$(cat /run/secrets/postgres_password)"
export PGPASSWORD="$POSTGRES_PASSWORD"
pg_dump --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" --format custom
' > "$backup_file"
docker compose exec -T postgres sh -eu -c '
export PGPASSWORD="$(cat /run/secrets/postgres_password)"
export PGPASSWORD="$POSTGRES_PASSWORD"
dropdb --username "$POSTGRES_USER" --if-exists "$1"
createdb --username "$POSTGRES_USER" "$1"
' sh "$restore_database"
docker compose exec -T postgres sh -eu -c '
export PGPASSWORD="$(cat /run/secrets/postgres_password)"
export PGPASSWORD="$POSTGRES_PASSWORD"
pg_restore --username "$POSTGRES_USER" --dbname "$1" --no-owner --no-privileges
' sh "$restore_database" < "$backup_file"
original=$(docker compose exec -T postgres sh -eu -c '
export PGPASSWORD="$(cat /run/secrets/postgres_password)"
export PGPASSWORD="$POSTGRES_PASSWORD"
psql --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" --tuples-only --no-align --command "
SELECT count(*) FROM users;
SELECT count(*) FROM chats;
@@ -43,7 +43,7 @@ original=$(docker compose exec -T postgres sh -eu -c '
')
restored=$(docker compose exec -T postgres sh -eu -c '
export PGPASSWORD="$(cat /run/secrets/postgres_password)"
export PGPASSWORD="$POSTGRES_PASSWORD"
psql --username "$POSTGRES_USER" --dbname "$1" --tuples-only --no-align --command "
SELECT count(*) FROM users;
SELECT count(*) FROM chats;
-21
View File
@@ -1,21 +0,0 @@
#!/bin/sh
set -eu
if [ -e secrets/postgres_password ] || [ -e secrets/valkey_password ] || [ -e secrets/database_url ] || [ -e secrets/cache_url ] || [ -e secrets/grafana_admin_password ]; then
echo "secrets already exist" >&2
exit 1
fi
umask 077
mkdir -p secrets
postgres_password=$(openssl rand -hex 24)
valkey_password=$(openssl rand -hex 24)
grafana_admin_password=$(openssl rand -hex 24)
printf '%s' "$postgres_password" > secrets/postgres_password
printf '%s' "$valkey_password" > secrets/valkey_password
printf 'postgres://messenger:%s@postgres:5432/messenger?sslmode=disable' "$postgres_password" > secrets/database_url
printf 'redis://default:%s@valkey:6379/0' "$valkey_password" > secrets/cache_url
printf '%s' "$grafana_admin_password" > secrets/grafana_admin_password