Docker compose konfiguratsiyasini yangilandi va xizmatlar uchun yangi buyruqlar qo'shildi.
This commit is contained in:
@@ -4,7 +4,7 @@ Accounts app urls
|
||||
|
||||
from django.urls import path, include
|
||||
from rest_framework_simplejwt import views as jwt_views
|
||||
from .views import RegisterView, ResetPasswordView, MeView, ChangePasswordView
|
||||
from .views import RegisterView, ResetPasswordView, MeView, ChangePasswordView, UserViewSet
|
||||
from rest_framework.routers import DefaultRouter
|
||||
|
||||
router = DefaultRouter()
|
||||
@@ -12,6 +12,7 @@ router.register("", RegisterView, basename="auth")
|
||||
router.register("", ResetPasswordView, basename="reset-password")
|
||||
router.register("", MeView, basename="me")
|
||||
router.register("", ChangePasswordView, basename="change-password")
|
||||
router.register("user", UserViewSet, basename="user")
|
||||
|
||||
|
||||
urlpatterns = [
|
||||
|
||||
@@ -1 +1,2 @@
|
||||
from .auth import * # noqa
|
||||
from .user import * # noqa
|
||||
|
||||
9
user/core/apps/accounts/views/user.py
Normal file
9
user/core/apps/accounts/views/user.py
Normal file
@@ -0,0 +1,9 @@
|
||||
from rest_framework.viewsets import GenericViewSet
|
||||
from django.contrib.auth import get_user_model
|
||||
from rest_framework.mixins import RetrieveModelMixin, ListModelMixin
|
||||
from ..serializers import UserSerializer
|
||||
|
||||
|
||||
class UserViewSet(RetrieveModelMixin, ListModelMixin, GenericViewSet):
|
||||
model = get_user_model()
|
||||
serializer_class = UserSerializer
|
||||
@@ -1,18 +1,22 @@
|
||||
networks:
|
||||
user:
|
||||
driver: bridge
|
||||
lamenu:
|
||||
external: true
|
||||
|
||||
volumes:
|
||||
pg_data: null
|
||||
rabbitmq: null
|
||||
pycache: null
|
||||
|
||||
services:
|
||||
nginx:
|
||||
user-nginx:
|
||||
labels:
|
||||
- "traefik.enable=true"
|
||||
- "traefik.http.routers.user.rule=PathPrefix(`/user`)"
|
||||
- "traefik.http.routers.user.entrypoints=web"
|
||||
- "traefik.http.services.user.loadbalancer.server.port=80"
|
||||
- "traefik.http.middlewares.user-strip-prefix.stripPrefix.prefixes=/user"
|
||||
- "traefik.http.routers.user.middlewares=user-strip-prefix"
|
||||
networks:
|
||||
- user
|
||||
ports:
|
||||
- ${PORT:-8001}:80
|
||||
- lamenu
|
||||
volumes:
|
||||
- ./resources/layout/nginx.conf:/etc/nginx/nginx.conf
|
||||
- ./resources/:/usr/share/nginx/html/resources/
|
||||
@@ -20,10 +24,10 @@ services:
|
||||
context: .
|
||||
dockerfile: ./docker/Dockerfile.nginx
|
||||
depends_on:
|
||||
- web
|
||||
web:
|
||||
networks:
|
||||
- user
|
||||
user:
|
||||
networks:
|
||||
- lamenu
|
||||
build:
|
||||
context: .
|
||||
dockerfile: ./docker/Dockerfile.web
|
||||
@@ -35,11 +39,10 @@ services:
|
||||
- .:/code
|
||||
- pycache:/var/cache/pycache
|
||||
depends_on:
|
||||
- db
|
||||
- redis
|
||||
db:
|
||||
- user-db
|
||||
user-db:
|
||||
networks:
|
||||
- user
|
||||
- lamenu
|
||||
image: postgres:16
|
||||
restart: always
|
||||
environment:
|
||||
@@ -48,8 +51,3 @@ services:
|
||||
POSTGRES_PASSWORD: '2309'
|
||||
volumes:
|
||||
- pg_data:/var/lib/postgresql/data
|
||||
redis:
|
||||
networks:
|
||||
- user
|
||||
restart: always
|
||||
image: redis
|
||||
Reference in New Issue
Block a user