Merge branch 'master' of git.dorfsvald.net:ewandor/cht-lawfirm

Makefile

@@ -0,0 +1,12 @@
+
+publish:
+	git checkout $(TAG)
+	docker build -f back/Dockerfile.prod -t git.dorfsvald.net/ewandor/cht-lawfirm-back-prod back
+	docker tag git.dorfsvald.net/ewandor/cht-lawfirm-back-prod:latest git.dorfsvald.net/ewandor/cht-lawfirm-back-prod:$(TAG)
+	docker push git.dorfsvald.net/ewandor/cht-lawfirm-back-prod:latest
+	docker push git.dorfsvald.net/ewandor/cht-lawfirm-back-prod:$(TAG)
+	docker build -f front/Dockerfile.prod -t git.dorfsvald.net/ewandor/cht-lawfirm-nginx-prod front
+	docker tag git.dorfsvald.net/ewandor/cht-lawfirm-nginx-prod:latest git.dorfsvald.net/ewandor/cht-lawfirm-nginx-prod:$(TAG)
+	docker push git.dorfsvald.net/ewandor/cht-lawfirm-nginx-prod:latest
+	docker push git.dorfsvald.net/ewandor/cht-lawfirm-nginx-prod:$(TAG)
+	git switch -

back/Dockerfile

@@ -5,13 +5,10 @@ RUN apt update && apt install -y xfonts-base xfonts-75dpi python3-pip python3-cf
 
 WORKDIR /code
 
-# copy both 'package.json' and 'package-lock.json' (if available)
 COPY ./requirements.txt /code/requirements.txt
 
-# install project dependencies
 RUN pip install --no-cache-dir --upgrade -r /code/requirements.txt
 
-# copy project files and folders to the current working directory (i.e. 'app' folder)
 COPY ./app /code/app
 
 EXPOSE 8000

back/Dockerfile.prod

@@ -0,0 +1,15 @@
+FROM python:3.10
+
+RUN apt update && apt install -y xfonts-base xfonts-75dpi python3-pip python3-cffi python3-brotli libpango-1.0-0 libpangoft2-1.0-0 \
+    && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /code
+
+COPY ./requirements.txt /code/requirements.txt
+
+RUN pip install --no-cache-dir --upgrade -r /code/requirements.txt
+
+COPY ./app /code/app
+
+EXPOSE 8000
+CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8000"]

back/app/contract/print/__init__.py

@@ -81,7 +81,7 @@ async def render_css(root_url, contract):
 async def preview_draft(draft_id: str, request: Request) -> str:
     draft = await build_model(await ContractDraft.get(draft_id))
 
-    return await render_print(f'{request.url.scheme}://{request.url.hostname}', draft)
+    return await render_print('', draft)
 
 
 @print_router.get("/preview/signature/{signature_id}", response_class=HTMLResponse)
@@ -91,7 +91,7 @@ async def preview_contract_by_signature(signature_id: str, request: Request) ->
         if p.signature_affixed:
             p.signature_png = retrieve_signature_png(f'media/signatures/{p.signature_uuid}.png')
 
-    return await render_print(f'{request.url.scheme}://{request.url.hostname}', contract)
+    return await render_print('', contract)
 
 
 @print_router.get("/preview/{contract_id}", response_class=HTMLResponse)
@@ -101,7 +101,7 @@ async def preview_contract(contract_id: str, request: Request) -> str:
         if p.signature_affixed:
             p.signature_png = retrieve_signature_png(f'media/signatures/{p.signature_uuid}.png')
 
-    return await render_print(f'{request.url.scheme}://{request.url.hostname}', contract)
+    return await render_print('', contract)
 
 
 @print_router.get("/pdf/{contract_id}", response_class=FileResponse)

back/migration.py

@@ -3,10 +3,10 @@ import asyncio
 import json
 from os import path
 
-from app.db import init_db, Entity, Order, Contract, User, AccessToken
+from app.db import init_db, Entity, Contract, ContractTemplate, ProvisionTemplate, User
 
 
-models = [Entity, Order, Contract, User]
+models = [Entity, Contract, User, ContractTemplate, ProvisionTemplate]
 
 
 async def handle_migration(args):

docker-compose.prod.yml

@@ -1,25 +1,19 @@
 version: "3.9"
 services:
   back:
-    build:
-      context: ${ROOT_PATH}/back
+    image: git.dorfsvald.net/ewandor/cht-lawfirm-back-prod:latest
     restart: always
-    ports:
-      - "8000:8000"
     volumes:
-      - ${ROOT_PATH}/back/app:/code/app
       - ${ROOT_PATH}/back/media:/code/media
 
   nginx:
-    build:
-      context: ${ROOT_PATH}/front
-      dockerfile: prod.Dockerfile
+    image: git.dorfsvald.net/ewandor/cht-lawfirm-nginx-prod:latest
     restart: always
     ports:
       - "3820:80"
 
   mongo:
-    image: "mongo:4.4.18"
+    image: "mongo:4.4.19"
     restart: always
     ports:
       - "27017:27017"

docker-compose.prod.yml.back

@@ -0,0 +1,42 @@
+version: "3.9"
+services:
+  back:
+    build:
+      context: ${ROOT_PATH}/back
+    restart: always
+    ports:
+      - "8000:8000"
+    volumes:
+      - ${ROOT_PATH}/back/app:/code/app
+      - ${ROOT_PATH}/back/media:/code/media
+
+  front:
+    build:
+      context: ${ROOT_PATH}/front
+    restart: always
+    ports:
+      - "4200:4200"
+    volumes:
+      - ${ROOT_PATH}/front/app/src:/app/src
+      - ${ROOT_PATH}/front/app/public:/app/public
+
+  nginx:
+    build:
+      context: ${ROOT_PATH}/nginx
+    restart: always
+    ports:
+      - "3820:80"
+
+  mongo:
+    image: "mongo:4.4.18"
+    restart: always
+    ports:
+      - "27017:27017"
+    environment:
+      MONGO_INITDB_ROOT_USERNAME: root
+      MONGO_INITDB_ROOT_PASSWORD: IBO3eber0mdw2R9pnInLdtFykQFY2f06
+    volumes:
+    - database:/data/db
+
+volumes:
+  database:

docker-compose.yml

@@ -3,6 +3,7 @@ services:
   back:
     build:
       context: ./back
+    image: cht-lawfirm-back-dev
     restart: always
     ports:
       - "8000:8000"
@@ -13,6 +14,7 @@ services:
   front:
     build:
       context: ./front
+    image: cht-lawfirm-front-dev
     restart: always
     ports:
       - "4200:4200"
@@ -23,12 +25,13 @@ services:
   nginx:
     build:
       context: ./nginx
+    image: cht-lawfirm-nginx-dev
     restart: always
     ports:
       - "80:80"
 
   mongo:
-    image: "mongo"
+    image: "mongo:4.4.19"
     restart: always
     ports:
       - "27017:27017"

front/nginx.prod.conf

@@ -30,7 +30,7 @@ http {
         root /usr/share/nginx/html;
 
         location / {
-            try_files $uri $uri/ /usr/share/nginx/html/index.html =404;
+            try_files $uri $uri/ /index.html?$args;
         }
 
         location ~* ^.+\.css$ {