se agrega api de usuarios
parent
805ff40ee7
commit
5f13f91ea4
|
|
@ -12,14 +12,10 @@ services:
|
||||||
- ./start.sh:/start.sh
|
- ./start.sh:/start.sh
|
||||||
ports:
|
ports:
|
||||||
- 4000:8000
|
- 4000:8000
|
||||||
|
working_dir: /app
|
||||||
command: sh /start.sh
|
command: sh /start.sh
|
||||||
environment:
|
environment:
|
||||||
DBHOST: db
|
PORT: 8000
|
||||||
DBPORT: 5432
|
|
||||||
DBNAME: database
|
|
||||||
DBUSER: postgres
|
|
||||||
DBPASS: password
|
|
||||||
DBSCHEMA: desarrollo1
|
|
||||||
|
|
||||||
db:
|
db:
|
||||||
image: postgres:14-alpine
|
image: postgres:14-alpine
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,4 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
cd /root/app
|
|
||||||
|
|
||||||
# si no existe directorio de ambiente, se crea
|
# si no existe directorio de ambiente, se crea
|
||||||
if [ ! -d ./libs ]; then
|
if [ ! -d ./libs ]; then
|
||||||
|
|
@ -19,19 +18,6 @@ if [ ! -f .env ]; then
|
||||||
cp .env.develop .env
|
cp .env.develop .env
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# asignar nueva password a root
|
|
||||||
if [ "$ROOTPASS" != "" ]; then
|
|
||||||
echo "Cambiando la password de root..."
|
|
||||||
echo -n "root:$ROOTPASS" | chpasswd
|
|
||||||
unset ROOTPASS
|
|
||||||
fi
|
|
||||||
|
|
||||||
# indicar a git carpeta segura
|
|
||||||
git config --global --add safe.directory /root/app
|
|
||||||
|
|
||||||
# iniciar ssh
|
|
||||||
sh /start.sh &
|
|
||||||
|
|
||||||
# iniciar servidor
|
# iniciar servidor
|
||||||
python /root/app/project/manage.py runserver 0.0.0.0:$PORT
|
python ./project/manage.py runserver 0.0.0.0:$PORT
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,4 @@
|
||||||
|
from django.contrib.auth.models import User
|
||||||
from rest_framework import serializers
|
from rest_framework import serializers
|
||||||
from .models import Project, Agency, Route
|
from .models import Project, Agency, Route
|
||||||
|
|
||||||
|
|
@ -16,3 +17,8 @@ class RouteSerializer(serializers.ModelSerializer):
|
||||||
model = Route
|
model = Route
|
||||||
fields = '__all__'
|
fields = '__all__'
|
||||||
|
|
||||||
|
class UserSerializer(serializers.ModelSerializer):
|
||||||
|
class Meta:
|
||||||
|
model = User
|
||||||
|
fields = ('id','username','first_name','last_name','email')
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,7 @@ router = routers.DefaultRouter()
|
||||||
router.register(r'projects', views.ProjectViewSet)
|
router.register(r'projects', views.ProjectViewSet)
|
||||||
router.register(r'agencies', views.AgencyViewSet)
|
router.register(r'agencies', views.AgencyViewSet)
|
||||||
router.register(r'routes', views.RouteViewSet)
|
router.register(r'routes', views.RouteViewSet)
|
||||||
|
router.register(r'users', views.UserViewSet)
|
||||||
|
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
path('', include(router.urls))
|
path('', include(router.urls))
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,8 @@
|
||||||
# from django.shortcuts import render
|
# from django.shortcuts import render
|
||||||
|
from django.contrib.auth.models import User
|
||||||
from rest_framework import viewsets
|
from rest_framework import viewsets
|
||||||
from .serializers import ProjectSerializer, AgencySerializer, RouteSerializer
|
from .serializers import ProjectSerializer, AgencySerializer, RouteSerializer
|
||||||
|
from .serializers import UserSerializer
|
||||||
from .models import Project, Agency, Route
|
from .models import Project, Agency, Route
|
||||||
|
|
||||||
# Create your views here.
|
# Create your views here.
|
||||||
|
|
@ -15,3 +17,7 @@ class AgencyViewSet(viewsets.ModelViewSet):
|
||||||
class RouteViewSet(viewsets.ModelViewSet):
|
class RouteViewSet(viewsets.ModelViewSet):
|
||||||
queryset = Route.objects.all()
|
queryset = Route.objects.all()
|
||||||
serializer_class = RouteSerializer
|
serializer_class = RouteSerializer
|
||||||
|
|
||||||
|
class UserViewSet(viewsets.ModelViewSet):
|
||||||
|
queryset = User.objects.all()
|
||||||
|
serializer_class = UserSerializer
|
||||||
Loading…
Reference in New Issue