lab 2 realization: PostgreSQL, Valkey, track 2
This commit is contained in:
@@ -0,0 +1,29 @@
|
||||
"""Create local secrets once. Never print values or overwrite existing secrets."""
|
||||
from pathlib import Path
|
||||
import secrets
|
||||
import shutil
|
||||
|
||||
root = Path(__file__).resolve().parents[1]
|
||||
folder = root / 'secrets'
|
||||
folder.mkdir(exist_ok=True)
|
||||
folder.chmod(0o700)
|
||||
def put(name, value):
|
||||
path = folder / name
|
||||
if not path.exists():
|
||||
with path.open('x', encoding='utf-8', newline='\n') as f:
|
||||
f.write(value + '\n')
|
||||
# Parent directory is private; Compose mounts individual files for non-root services.
|
||||
path.chmod(0o644)
|
||||
return path.read_text(encoding='utf-8').strip()
|
||||
|
||||
pg = put('postgres_password', secrets.token_hex(32))
|
||||
vk = put('valkey_password', secrets.token_hex(32))
|
||||
put('database_url', f'postgres://messenger:{pg}@db:5432/messenger?sslmode=disable')
|
||||
put('cache_url', f'redis://:{vk}@valkey:6379/0')
|
||||
put('cursor_secret', secrets.token_hex(32))
|
||||
put('valkey.conf', '\n'.join(['bind 0.0.0.0', 'protected-mode yes', f'requirepass {vk}',
|
||||
'dir /data', 'appendonly yes', 'appendfsync always', 'maxmemory 128mb',
|
||||
'maxmemory-policy noeviction', 'save 60 1000']))
|
||||
if not (root / '.env').exists():
|
||||
shutil.copyfile(root / '.env.example', root / '.env')
|
||||
print('Local .env and secrets ready; existing values preserved.')
|
||||
@@ -0,0 +1,17 @@
|
||||
"""Run unchanged make targets in Linux, including the executable restart.sh."""
|
||||
import argparse
|
||||
from pathlib import Path
|
||||
import subprocess
|
||||
|
||||
root=Path(__file__).resolve().parents[1]
|
||||
p=argparse.ArgumentParser()
|
||||
p.add_argument('target',choices=['check','test','test-own','test-race','test-persistence'])
|
||||
args=p.parse_args()
|
||||
command=['docker','run','--rm','--network','mtusi-lab2_default',
|
||||
'--mount','type=bind,source='+str(root)+',target=/workspace']
|
||||
if args.target=='test-persistence':
|
||||
command+=['--mount','type=bind,source=/var/run/docker.sock,target=/var/run/docker.sock']
|
||||
command+=['mtusi-messenger:lab2-tests','make',args.target,'BASE_URL=http://api:8080']
|
||||
if args.target=='test-persistence':
|
||||
command+=['ACTION_SCRIPT=scripts/restart.sh']
|
||||
raise SystemExit(subprocess.call(command,cwd=root))
|
||||
Executable
+19
@@ -0,0 +1,19 @@
|
||||
#!/bin/sh
|
||||
set -eu
|
||||
cd "$(dirname "$0")/.."
|
||||
mkdir -p evidence
|
||||
docker compose --env-file .env ps -q api db valkey | xargs docker inspect --format '{{.Name}} {{.State.StartedAt}}' > evidence/restart-before.txt
|
||||
docker compose --env-file .env stop api
|
||||
docker compose --env-file .env restart db valkey
|
||||
# Do not recreate containers: this also works from a Linux test runner.
|
||||
for service in db valkey; do
|
||||
container=$(docker compose --env-file .env ps -q "$service")
|
||||
attempts=0
|
||||
until [ "$(docker inspect --format '{{.State.Health.Status}}' "$container")" = healthy ]; do
|
||||
attempts=$((attempts+1))
|
||||
[ "$attempts" -lt 40 ] || exit 1
|
||||
sleep 1
|
||||
done
|
||||
done
|
||||
docker compose --env-file .env start api
|
||||
docker compose --env-file .env ps -q api db valkey | xargs docker inspect --format '{{.Name}} {{.State.StartedAt}}' > evidence/restart-after.txt
|
||||
Reference in New Issue
Block a user