From 405580b3b398454b2b369c83c4199115fe192a1c Mon Sep 17 00:00:00 2001 From: Egor Deev Date: Tue, 6 Oct 2026 17:04:09 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D1=80=D0=B0=D0=B7=D1=8B=20=D0=BD?= =?UTF-8?q?=D0=B0=20git.deev.su=20=D0=B2=D0=BC=D0=B5=D1=81=D1=82=D0=BE=20d?= =?UTF-8?q?cr.deev.su:=20=D1=80=D0=B5=D0=B5=D1=81=D1=82=D1=80=20zot=20?= =?UTF-8?q?=D0=B2=D1=8B=D0=B2=D0=B5=D0=B4=D0=B5=D0=BD=20=D0=B8=D0=B7=20?= =?UTF-8?q?=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D1=8B,=20=D0=BA=D0=BE=D0=BF?= =?UTF-8?q?=D0=B8=D1=8E=20=D0=B8=D0=B7=20GHCR=20=D0=B4=D0=B5=D0=BB=D0=B0?= =?UTF-8?q?=D0=B5=D1=82=20=D1=81=D0=B8=D0=BD=D1=85=D1=80=D0=BE=D0=BD=D0=B8?= =?UTF-8?q?=D0=B7=D0=B0=D1=82=D0=BE=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.en.md | 6 +++--- README.md | 6 +++--- lab-2/web_lite/docker-compose.yaml | 4 ++-- lab-2/web_pg/docker-compose.yaml | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.en.md b/README.en.md index 09503df..9b716b1 100644 --- a/README.en.md +++ b/README.en.md @@ -19,7 +19,7 @@ C++17 · Qt 6 (Widgets, Network) · CMake | | What was built | Folder | |---|---|---| | 1 | REST API: `Quiz` model, serializer, `ModelViewSet`, Faker test data generator, PostgreSQL | [`lab-1/`](lab-1) | -| 2 | The API in containers: gunicorn behind nginx, static files from a shared volume, own images in the `dcr.deev.su` registry | [`lab-2/`](lab-2) | +| 2 | The API in containers: gunicorn behind nginx, static files from a shared volume, own images in the `git.deev.su` registry | [`lab-2/`](lab-2) | | 3 | Desktop client for the API: five HTTP methods, table and text views, Singleton and Adapter | [`lab-3/`](lab-3) | Deployment options in the second lab: @@ -27,8 +27,8 @@ Deployment options in the second lab: | Folder | Images | PostgreSQL | |---|---|---| | `local/` | built from source | in a container | -| `web_pg/` | prebuilt `dcr.deev.su/deevev/lab2-*` | in a container | -| `web_lite/` | prebuilt `dcr.deev.su/deevev/lab2-*` | external | +| `web_pg/` | prebuilt `git.deev.su/deevev/quizlab` | in a container | +| `web_lite/` | prebuilt `git.deev.su/deevev/quizlab` | external | | `caddy/` | built from source, Caddy instead of nginx, HTTPS with a self-signed certificate | in a container | ## How it works diff --git a/README.md b/README.md index d290a05..6399d1c 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ C++17 · Qt 6 (Widgets, Network) · CMake | | Что сделано | Папка | |---|---|---| | 1 | REST API: модель `Quiz`, сериализатор, `ModelViewSet`, генератор тестовых данных на Faker, PostgreSQL | [`lab-1/`](lab-1) | -| 2 | API в контейнерах: gunicorn за nginx, статика из общего тома, свои образы в реестре `dcr.deev.su` | [`lab-2/`](lab-2) | +| 2 | API в контейнерах: gunicorn за nginx, статика из общего тома, свои образы в реестре `git.deev.su` | [`lab-2/`](lab-2) | | 3 | Десктопный клиент к API: пять HTTP-методов, таблица и текстовый вид, Singleton и Adapter | [`lab-3/`](lab-3) | Варианты развёртывания во второй лабораторной: @@ -27,8 +27,8 @@ C++17 · Qt 6 (Widgets, Network) · CMake | Папка | Образы | PostgreSQL | |---|---|---| | `local/` | собираются из исходников | в контейнере | -| `web_pg/` | готовые из `dcr.deev.su/deevev/lab2-*` | в контейнере | -| `web_lite/` | готовые из `dcr.deev.su/deevev/lab2-*` | внешний | +| `web_pg/` | готовые из `git.deev.su/deevev/quizlab` | в контейнере | +| `web_lite/` | готовые из `git.deev.su/deevev/quizlab` | внешний | | `caddy/` | собираются из исходников, Caddy вместо nginx, HTTPS с самоподписанным сертификатом | в контейнере | ## Как устроено diff --git a/lab-2/web_lite/docker-compose.yaml b/lab-2/web_lite/docker-compose.yaml index efed445..b8f6863 100644 --- a/lab-2/web_lite/docker-compose.yaml +++ b/lab-2/web_lite/docker-compose.yaml @@ -2,7 +2,7 @@ name: lab2-web-lite services: backend_service: - image: dcr.deev.su/deevev/lab2-backend:1.0.0 + image: git.deev.su/deevev/quizlab:backend-1.0.0 command: > sh -c "python manage.py migrate && python manage.py collectstatic --no-input && @@ -14,7 +14,7 @@ services: restart: unless-stopped nginx_service: - image: dcr.deev.su/deevev/lab2-nginx:1.0.0 + image: git.deev.su/deevev/quizlab:nginx-1.0.0 ports: - "80:80" volumes: diff --git a/lab-2/web_pg/docker-compose.yaml b/lab-2/web_pg/docker-compose.yaml index 449bf5f..0a884d0 100644 --- a/lab-2/web_pg/docker-compose.yaml +++ b/lab-2/web_pg/docker-compose.yaml @@ -14,7 +14,7 @@ services: - postgres_data:/var/lib/postgresql/data backend_service: - image: dcr.deev.su/deevev/lab2-backend:1.0.0 + image: git.deev.su/deevev/quizlab:backend-1.0.0 command: > # python manage.py createsuperuser --noinput && sh -c "python manage.py migrate && python manage.py shell -c 'from quiz.gentestdata import gentestdata; gentestdata()' && @@ -30,7 +30,7 @@ services: restart: unless-stopped nginx_service: - image: dcr.deev.su/deevev/lab2-nginx:1.0.0 + image: git.deev.su/deevev/quizlab:nginx-1.0.0 ports: - "80:80" volumes: