forked from mtusi2026/mtusi2026lab2
реализация второй лабы
This commit is contained in:
+3
-2
@@ -1,5 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
project_dir="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
docker build --tag "${IMAGE_NAME:-mtusi-messenger:lab2}" "$@" "$project_dir"
|
||||
cd "$project_dir"
|
||||
python3 scripts/init_local.py
|
||||
docker compose build "$@" api
|
||||
|
||||
@@ -1,16 +1,11 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
project_dir="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
cd "$project_dir"
|
||||
if [[ ! -x .venv/bin/python ]]; then
|
||||
echo "Не хватает .venv" >&2
|
||||
echo "python3 -m venv .venv" >&2
|
||||
echo ".venv/bin/python -m pip install -r requirements.txt" >&2
|
||||
echo "Создай .venv и установи requirements.txt по REPORT.md" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
./scripts/build.sh
|
||||
mkdir -p evidence
|
||||
.venv/bin/python -u student-tests/docker_lifecycle.py \
|
||||
--image "${IMAGE_NAME:-mtusi-messenger:lab2}" 2>&1 | tee evidence/docker-checks.txt
|
||||
.venv/bin/python -u student-tests/docker_lifecycle.py 2>&1 | tee evidence/docker-checks.txt
|
||||
|
||||
+22
-37
@@ -1,42 +1,27 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
if ! command -v jq >/dev/null; then
|
||||
echo "Для demo.sh нужен jq" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
base_url="${BASE_URL:-http://localhost:8080}"
|
||||
base_url="${base_url%/}"
|
||||
|
||||
suffix="$(date +%s)_$RANDOM"
|
||||
|
||||
post_json() {
|
||||
local path="$1"
|
||||
local body="$2"
|
||||
shift 2
|
||||
curl --fail --silent --show-error --connect-timeout 5 --max-time 10 \
|
||||
-H "Content-Type: application/json" --data "$body" "$@" "$base_url$path"
|
||||
# Только синтетические пароли; токены остаются в памяти shell и не выводятся.
|
||||
password="Demo-password-$suffix"
|
||||
register() {
|
||||
local username="$1" display_name="$2"
|
||||
jq -nc --arg u "$username" --arg d "$display_name" --arg p "$password" \
|
||||
'{username:$u, display_name:$d, password:$p}' |
|
||||
curl -fsS -H 'Content-Type: application/json' --data-binary @- "$base_url/api/v1/users" | jq -er '.id'
|
||||
}
|
||||
|
||||
echo "Создаём Алису и Боба"
|
||||
alice_body="$(jq -nc --arg name "alice_$suffix" '{username: $name, display_name: "Алиса"}')"
|
||||
bob_body="$(jq -nc --arg name "bob_$suffix" '{username: $name, display_name: "Боб"}')"
|
||||
alice_id="$(post_json /api/v1/users "$alice_body" | jq -er '.id')"
|
||||
bob_id="$(post_json /api/v1/users "$bob_body" | jq -er '.id')"
|
||||
|
||||
echo "Создаём общий чат"
|
||||
chat_body="$(jq -nc --arg alice "$alice_id" --arg bob "$bob_id" \
|
||||
'{title: "Учебный чат", member_ids: [$alice, $bob]}')"
|
||||
chat_id="$(post_json /api/v1/chats "$chat_body" -H "X-User-Id: $alice_id" | jq -er '.id')"
|
||||
path="/api/v1/chats/$chat_id/messages"
|
||||
|
||||
echo "Отправляем сообщение от Алисы"
|
||||
post_json "$path" '{"text":"Привет, Боб! 👋"}' -H "X-User-Id: $alice_id" | jq .
|
||||
|
||||
echo "Отправляем ответ от Боба"
|
||||
post_json "$path" '{"text":"Привет, Алиса!"}' -H "X-User-Id: $bob_id" | jq .
|
||||
|
||||
echo "Читаем общую историю от имени Алисы"
|
||||
curl --fail --silent --show-error --connect-timeout 5 --max-time 10 \
|
||||
-H "X-User-Id: $alice_id" "$base_url$path?limit=50" | jq .
|
||||
login() {
|
||||
curl -fsS -X POST -u "$1:$password" "$base_url/api/v1/auth/sessions" | jq -er '.token'
|
||||
}
|
||||
alice_id="$(register "alice_$suffix" Алиса)"
|
||||
bob_id="$(register "bob_$suffix" Боб)"
|
||||
alice_token="$(login "alice_$suffix")"
|
||||
bob_token="$(login "bob_$suffix")"
|
||||
chat_id="$(jq -nc --arg a "$alice_id" --arg b "$bob_id" '{title:"Учебный чат",member_ids:[$a,$b]}' |
|
||||
curl -fsS -H "Authorization: Bearer $alice_token" -H 'Content-Type: application/json' \
|
||||
--data-binary @- "$base_url/api/v1/chats" | jq -er '.id')"
|
||||
for token in "$alice_token" "$bob_token"; do
|
||||
curl -fsS -H "Authorization: Bearer $token" -H 'Content-Type: application/json' \
|
||||
-d '{"text":"Привет из lab2! 👋"}' "$base_url/api/v1/chats/$chat_id/messages" | jq .
|
||||
done
|
||||
curl -fsS -H "Authorization: Bearer $bob_token" "$base_url/api/v1/chats/$chat_id/messages" | jq .
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
"""Создаёт локальное окружение и secrets; существующие значения сохраняет."""
|
||||
from pathlib import Path
|
||||
import secrets
|
||||
import shutil
|
||||
from urllib.parse import quote
|
||||
|
||||
|
||||
root = Path(__file__).resolve().parents[1]
|
||||
if not (root / ".env").exists():
|
||||
shutil.copyfile(root / ".env.example", root / ".env")
|
||||
directory = root / "secrets"
|
||||
directory.mkdir(exist_ok=True, mode=0o700)
|
||||
directory.chmod(0o700)
|
||||
password_file = directory / "postgres_password"
|
||||
if not password_file.exists():
|
||||
password_file.write_text(secrets.token_hex(24))
|
||||
password = password_file.read_text().strip()
|
||||
values = {
|
||||
"database_url": f"postgresql://messenger:{quote(password, safe='')}@postgres:5432/messenger",
|
||||
"cache_url": "redis://valkey:6379/0",
|
||||
}
|
||||
for name, value in values.items():
|
||||
path = directory / name
|
||||
if not path.exists():
|
||||
path.write_text(value)
|
||||
# Каталог 0700 защищает файлы на хосте; 0444 позволяет USER 10001 читать bind-mounted secret.
|
||||
for name in ("postgres_password", "database_url", "cache_url"):
|
||||
(directory / name).chmod(0o444)
|
||||
print("Local .env and secrets are ready; values are not printed")
|
||||
Executable
+5
@@ -0,0 +1,5 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
project_dir="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
cd "$project_dir"
|
||||
docker compose exec -T api python -m src.migrate
|
||||
Executable
+7
@@ -0,0 +1,7 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
project_dir="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
cd "$project_dir"
|
||||
./scripts/build.sh
|
||||
mkdir -p evidence
|
||||
python3 -u research/run.py 2>&1 | tee evidence/research.txt
|
||||
Executable
+6
@@ -0,0 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
project_dir="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
cd "$project_dir"
|
||||
docker compose restart --timeout 10 postgres valkey api
|
||||
./scripts/wait-ready.sh
|
||||
+2
-12
@@ -1,15 +1,5 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
# В lab2 локальный запуск включает API, PostgreSQL и Valkey.
|
||||
project_dir="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
cd "$project_dir"
|
||||
|
||||
if [[ ! -x .venv/bin/python ]]; then
|
||||
echo "Не хватает .venv" >&2
|
||||
echo "python3 -m venv .venv" >&2
|
||||
echo ".venv/bin/python -m pip install -r requirements.txt" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
||||
exec .venv/bin/python -m src
|
||||
exec "$project_dir/scripts/start.sh"
|
||||
|
||||
+4
-16
@@ -1,19 +1,7 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
project_dir="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
container="${CONTAINER_NAME:-mtusi-messenger-lab2}"
|
||||
port="${HOST_PORT:-8080}"
|
||||
|
||||
if [[ ! -f "$project_dir/.env" ]]; then
|
||||
cp "$project_dir/.env.example" "$project_dir/.env"
|
||||
fi
|
||||
|
||||
|
||||
docker run --detach --name "$container" --label mtusi.lab=2 \
|
||||
--cpus 1 --memory 256m \
|
||||
--publish "127.0.0.1:$port:8080" \
|
||||
--env-file "$project_dir/.env" \
|
||||
"${IMAGE_NAME:-mtusi-messenger:lab2}"
|
||||
"$project_dir/scripts/wait-ready.sh" "$container"
|
||||
echo "API: http://localhost:$port"
|
||||
cd "$project_dir"
|
||||
python3 scripts/init_local.py
|
||||
docker compose up -d --build api
|
||||
./scripts/wait-ready.sh
|
||||
|
||||
+4
-10
@@ -1,12 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
container="${CONTAINER_NAME:-mtusi-messenger-lab2}"
|
||||
if [[ "$(docker inspect --format '{{index .Config.Labels "mtusi.lab"}}' "$container")" != 2 ]]; then
|
||||
echo "У $container нет метки mtusi.lab=2; остановка отменена" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
docker stop --time 10 "$container"
|
||||
docker rm "$container"
|
||||
echo "Контейнер удалён"
|
||||
project_dir="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
cd "$project_dir"
|
||||
docker compose down --timeout 10
|
||||
echo "Контейнеры удалены; именованные volumes сохранены"
|
||||
|
||||
+5
-11
@@ -1,19 +1,13 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
container="${1:-mtusi-messenger-lab2}"
|
||||
project_dir="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
cd "$project_dir"
|
||||
for ((attempt = 0; attempt < 60; attempt++)); do
|
||||
running="$(docker inspect --format '{{.State.Running}}' "$container")"
|
||||
health="$(docker inspect --format '{{.State.Health.Status}}' "$container")"
|
||||
if [[ "$running" != true || "$health" == unhealthy ]]; then
|
||||
echo "Контейнер $container не готов. Посмотри: docker logs $container" >&2
|
||||
exit 1
|
||||
fi
|
||||
if [[ "$health" == healthy ]]; then
|
||||
echo "$container: healthy"
|
||||
if docker compose exec -T api python -m src.healthcheck >/dev/null 2>&1; then
|
||||
echo "API ready"
|
||||
exit 0
|
||||
fi
|
||||
sleep 1
|
||||
done
|
||||
echo "Контейнер $container не стал готов за 60 секунд" >&2
|
||||
echo "API не готов за 60 секунд. Проверь docker compose logs api" >&2
|
||||
exit 1
|
||||
|
||||
Reference in New Issue
Block a user