diff --git a/lab-2/DOCKER_GUIDE.md b/lab-2/DOCKER_GUIDE.md deleted file mode 100644 index 19423a6..0000000 --- a/lab-2/DOCKER_GUIDE.md +++ /dev/null @@ -1,79 +0,0 @@ -# Docker Lab 2 - -Авторизация в реестре: `docker login dcr.deev.su` - -## 1. Запуск локально (lab-2/local) - -```bash -cd lab-2/local -docker compose up --build - -docker compose up # Запуск -docker compose down # Остановка -``` - -После запуска: -- API: http://localhost/api/quiz/ -- Админка: http://localhost/admin/ - - -## 2. Запуск из реестра с внешней БД (lab-2/web_lite) - -Образы с `dcr.deev.su`. PostgreSQL на `95.31.185.229`. - -```bash -cd lab-2/web_lite -docker compose pull -docker compose up - -docker compose down # Остановить -``` - -После запуска: -- API: http://localhost/api/quiz/ -- Админка: http://localhost/admin/ - - -## 3. Запуск из реестра с локальной БД (lab-2/web_pg) - -Образы с `dcr.deev.su`. - -```bash -cd lab-2/web_pg -docker compose pull -docker compose up - -docker compose down # Остановить -``` - -После запуска: -- API: http://localhost/api/quiz/ -- Админка: http://localhost/admin/ - - -## Обновление образов в реестре - -### После обновления образов -```bash -cd lab-2/web_pg -docker compose pull -docker compose up - -cd lab-2/web_lite -docker compose pull -docker compose up -``` - -### Backend -```bash -cd lab-2/local -docker build -t dcr.deev.su/edeev/lab2-aad/backend:latest ./backend -docker push dcr.deev.su/edeev/lab2-aad/backend:latest -``` - -### Nginx -```bash -cd lab-2/local -docker build -t dcr.deev.su/edeev/lab2-aad/nginx:latest ./nginx -docker push dcr.deev.su/edeev/lab2-aad/nginx:latest -``` \ No newline at end of file diff --git a/lab-2/web_lite/docker-compose.yaml b/lab-2/web_lite/docker-compose.yaml index a757eb2..efed445 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/edeev/lab2-aad/backend:latest + image: dcr.deev.su/deevev/lab2-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/edeev/lab2-aad/nginx:latest + image: dcr.deev.su/deevev/lab2-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 2609ab9..dba74d0 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/edeev/lab2-aad/backend:latest + image: dcr.deev.su/deevev/lab2-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/edeev/lab2-aad/nginx:latest + image: dcr.deev.su/deevev/lab2-nginx:1.0.0 ports: - "80:80" volumes: