cleanup

Makefile

@@ -1,44 +1,3 @@
-ORGANIZATION = corpulent
-CONTAINER = ctk-server
-VERSION = 0.1.0
-
-.PHONY : validate build pull up down down_clean reset run backend_dev shell_server shell_nginx local_setup local_build
-
-validate :
-	docker compose config
-
-build : validate
-	docker compose build
-
-pull :
-	docker compose pull
-
+.PHONY: up
 up :
-	docker compose up -d
-
-up_local :
-	docker compose up -d --no-build
-
-down :
-	docker compose down
-
-down_clean : down
-	-docker volume rm ctk_postgres_data
-	-docker volume rm ctk_django_static
-
-reset : down
-	make up
-
-dev_server :
-	docker exec -ti $(CONTAINER) python /home/server/manage.py runserver 0.0.0.0:9001
-
-shell_server:
-	docker exec -it ${CONTAINER} bash
-
-frontend_build:
-	@ cd ./services/frontend/src && npm install && npm run build
-
-local_server_init:
-	docker exec -it ${CONTAINER} python /home/server/manage.py makemigrations \
-	&& docker exec -it ${CONTAINER} python /home/server/manage.py migrate \
-	&& docker exec -it ${CONTAINER} python /home/server/manage.py collectstatic --noinput
+	docker compose up

docker-compose.yml

@@ -4,9 +4,6 @@ volumes:
   postgres-data:
     driver: local
     name: ctk_postgres_data
-  django-static:
-    driver: local
-    name: ctk_django_static
 
 services:
   postgres:
@@ -18,6 +15,8 @@ services:
       - postgres-data:/var/lib/postgresql/data
     environment:
       - POSTGRES_PASSWORD=postgres
+    networks:
+      - ctk-dev
 
   backend:
     container_name: ctk-server
@@ -25,32 +24,21 @@ services:
     build:
       context: ./
       dockerfile: ./services/backend/Dockerfile
-    image: corpulent/ctk-api:1.0.0
-    working_dir: /home
+    image: omhq/ctk-server:0.0.1
+    working_dir: /app
     depends_on:
       - postgres
-    links:
-      - postgres
     volumes:
-      - ./services/backend/src:/home/server/
-      - ./services/backend/configs:/home/configs/
-      - django-static:/static/
+      - ./services/backend/src:/app/
+      - ./services/backend/alembic:/alembic
+      - ./services/backend/alembic.ini:/alembic.ini
     ports:
       - "9001:9001"
-      - "9000:9000"
     environment:
-      - DB_REMOTE=False
-      - APP_URL=
+      - DATABASE_URL=postgresql+psycopg2://postgres:postgres@postgres:5432/postgres
+    networks:
+      - ctk-dev
 
-  frontend:
-    container_name: ctk-frontend
-    restart: always
-    build:
-      context: ./
-      dockerfile: ./services/frontend/Dockerfile
-    image: corpulent/ctk-frontend:1.0.0
-    volumes:
-      - ./services/frontend/configs/nginx/default.conf:/etc/nginx/conf.d/default.conf
-      - ./services/frontend/build:/usr/share/nginx/html/
-    ports:
-      - "8080:8080"
+networks:
+  ctk-dev:
+    driver: bridge

services/backend/alembic/env.py

@@ -16,7 +16,7 @@ config = context.config
 if config.config_file_name is not None:
     fileConfig(config.config_file_name)
 
-sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "src")))
+sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "app")))
 
 # add your model's MetaData object here
 # for 'autogenerate' support

services/backend/alembic/versions/6cb0dede5a07_initial.py

@@ -0,0 +1,30 @@
+"""initial
+
+Revision ID: 6cb0dede5a07
+Revises: 
+Create Date: 2026-02-13 10:53:39.305829
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = '6cb0dede5a07'
+down_revision: Union[str, None] = None
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###