Refactor and add docker-compose.yml(s)

.pre-commit-config.yaml

@@ -8,9 +8,9 @@ repos:
     rev: 6.1.0
     hooks:
       - id: flake8
-        args: [--config, flights-domain/setup.cfg]
+        args: [--config, flights-domain/flights-information/setup.cfg]
   - repo: https://github.com/pycqa/isort
     rev: 5.12.0
     hooks:
       - id: isort
-        args: ['--src-path', 'flights-domain/']
+        args: ['--src-path', 'flights-domain/', 'auth-domain/user-manager/']

auth-domain/user-manager/manage.py

@@ -1,8 +1,6 @@
 from flask.cli import FlaskGroup
-
+from src import create_app, db
-from src import create_app, db 
+from src.api.models.users import User
-from src.api.models.users import User 
-
 
 app = create_app()
 cli = FlaskGroup(create_app=create_app) 

browser-domain/Dockerfile.prod

@@ -1,8 +1,13 @@
 FROM node:17.9.1 AS app
-ENV REACT_APP_ENDPOINT "https://api.fids.slc.ar/"
 WORKDIR /app
+COPY package.json /app/package.json
+RUN npm install
 COPY . .
-RUN npm install && npm run build
+
+ARG REACT_APP_ENDPOINT
+ENV REACT_APP_ENDPOINT $REACT_APP_ENDPOINT
+
+RUN npm run build
 
 FROM nginx:alpine
 WORKDIR /usr/share/nginx/html

browser-domain/docker-compose.yml

@@ -0,0 +1,12 @@
+version: '3.8'
+
+services:
+  client:
+    container_name: fids_browser_client
+    image: ${CLIENT_IMAGE}
+    restart: always
+    ports:
+      - 8080:80
+    environment:
+      - API_HOST=api
+    network_mode: host

flights-domain/docker-compose.yml

@@ -2,12 +2,9 @@ version: '3.8'
 
 services:
 
-  api:
+  flights-api:
-    container_name: fids_api
+    container_name: fids_flights_api
     image: ${API_IMAGE}
-    profiles:
-      - api
-      - all
     ports:
       - 5000:5000
     healthcheck:
@@ -19,20 +16,17 @@ services:
     environment:
       - TEST_TARGET=${TEST_TARGET}
       - PORT=5000
-      - DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASS}@api-db/${POSTGRES_DB}
+      - DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASS}@flights-api-db/${POSTGRES_DB}
       - APP_SETTINGS=${APP_SETTINGS}
     depends_on:
-      api-db:
+      flights-api-db:
         condition: service_healthy
 
-  api-db: 
+  flights-api-db: 
-    container_name: fids_api_db
+    container_name: fids_flights_db
     build:
       context: ./db
       dockerfile: Dockerfile
-    profiles:
-      - api
-      - all
     healthcheck:
       test: psql postgres --command "select 1" -U ${POSTGRES_USER}
       interval: 2s
@@ -44,18 +38,3 @@ services:
     environment:
       - POSTGRES_USER=${POSTGRES_USER}
       - POSTGRES_PASSWORD=${POSTGRES_PASS}
-
-  client:
-    container_name: fids_client
-    image: ${CLIENT_IMAGE}
-    profiles:
-      - client
-      - all
-    restart: always
-    ports:
-      - 8080:80
-    depends_on:
-      api:
-        condition: service_healthy
-    environment:
-      - API_HOST=api

flights-domain/flights-information/src/api/cruds/flight.py

@@ -1,6 +1,5 @@
 from sqlalchemy.orm import Session
 from sqlalchemy.sql import func
-
 from src.api.models.flight import Flight
 from src.api.schemas.flight import Flight as FlightPydantic
 

flights-domain/flights-information/src/api/main.py

@@ -1,6 +1,5 @@
 from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
-
 from src.api.db import Base, engine
 from src.api.routes import flights, health
 
@@ -14,6 +13,9 @@ app.add_middleware(
     allow_origins=[
         "https://fids.slc.ar",
         "http://localhost:8080",
+        "http://localhost",
+        "http://localhost:80",
+        "http://localhost:81",
         "http://localhost:3000",
     ],
     allow_credentials=True,

flights-domain/flights-information/src/api/models/flight.py

@@ -1,6 +1,5 @@
 from sqlalchemy import Column, DateTime, Integer, String
 from sqlalchemy.sql import func
-
 from src.api.db import Base
 
 

flights-domain/flights-information/src/api/routes/flights.py

@@ -2,7 +2,6 @@ from typing import Optional
 
 from fastapi import APIRouter, Depends, HTTPException
 from sqlalchemy.orm import Session
-
 from src.api.cruds import flight as flight_crud
 from src.api.db import get_db
 from src.api.schemas.flight import Flight, FlightCreate, FlightStatusUpdate

flights-domain/flights-information/src/tests/dummy_test.py

@@ -1,5 +1,4 @@
 from fastapi.testclient import TestClient
-
 from src.api.main import Flight, app, flight_instance
 
 client = TestClient(app)

screen-domain/Dockerfile.prod

@@ -1,8 +1,14 @@
 FROM node:17.9.1 AS app
-ENV REACT_APP_ENDPOINT "https://api.fids.slc.ar/"
 WORKDIR /app
+COPY package.json /app/package.json
+RUN npm -v && ls -al
+RUN npm install
 COPY . .
-RUN npm install && npm run build
+
+ARG REACT_APP_ENDPOINT
+ENV REACT_APP_ENDPOINT $REACT_APP_ENDPOINT
+
+RUN npm run build
 
 FROM nginx:alpine
 WORKDIR /usr/share/nginx/html

screen-domain/docker-compose.yml

@@ -0,0 +1,12 @@
+version: '3.8'
+
+services:
+  screens-client:
+    container_name: fids_screens_client
+    image: ${CLIENT_IMAGE}
+    restart: always
+    ports:
+      - 8080:80
+    environment:
+      - API_HOST=api
+    network_mode: host

screen-domain/nginx/default.conf

@@ -1,5 +1,5 @@
 server {
-    listen 80;
+    listen 81;
     location / {
         root /usr/share/nginx/html;
         index unresolvable-file-html.html;