Merge pull request #11 from finmars-platform/PLAT-1843

Update make file commands

Author: paktusov

.env.sample

@@ -2,7 +2,7 @@ DB_NAME=finmars_dev
 DB_USER=postgres
 DB_PASSWORD=postgres
 DB_HOST=172.17.0.1
-DB_PORT=5434
+DB_PORT=5432
 DEBUG=False
 LOCAL=1
 AWS_STORAGE_BUCKET_NAME=YOUR_AWS_STORAGE_BUCKET_NAME

Makefile

@@ -19,19 +19,8 @@ help:
 	@echo "  make manage   		- Run manage.py command"
 	@echo "  make manage-help	- Show available manage.py commands"
 
-env:
-	@if [ -f .env ]; then \
-		read -p ".env already exists. Overwrite? (y/N): " ans; \
-		if [ "$$ans" = "y" ] || [ "$$ans" = "Y" ]; then \
-			cp .env.sample .env; \
-			echo ".env overwritten."; \
-		else \
-			echo "Skipped creating .env."; \
-		fi; \
-	else \
-		cp .env.sample .env; \
-		echo ".env created from .env.sample."; \
-	fi
+generate-env:
+	./generate_env.sh
 
 venv:
 	python3 -m venv $(VENV_NAME)
@@ -48,6 +37,12 @@ test:
 lint:
 	$(COMPOSE) exec -i $(SERVICE) ruff format --exclude '**/migrations/*.py'
 
+migrate:
+	./migrate.sh
+
+import-sql: 
+	./import-sql.sh
+
 up:
 	$(COMPOSE) up --build
 

README.md

@@ -318,3 +318,11 @@ basename="import_csv",
 * `main` - Start when PR merge in `main` branch. Increment patch version and publish release candidate image.
 * `release` - Start manually from `main` branch. Increment minor version and publish stable image
 * `patch_release` - Start manually from `main` branch. Publish current version stable image 
+
+
+# First start
+
+1) make generate-env
+2) make import-sql (fror demo or restore db from dump)
+3) make migrate
+4) make up

docker-compose.override.yml

@@ -5,6 +5,10 @@ services:
       - .env
     volumes:
       - ./poms:/var/app/poms
+    depends_on:
+      - db
+      - rabbitmq
+      - redis
     restart: always
     ports:
       - "8000:8080"
@@ -16,6 +20,10 @@ services:
     environment:
       - DJANGO_SETTINGS_MODULE=poms_app.settings # remove after change manage.py location
       - INSTANCE_TYPE=worker
+    depends_on:
+      - db
+      - rabbitmq
+      - redis
 
   scheduler:
     build: .
@@ -24,13 +32,49 @@ services:
     environment:
       - DJANGO_SETTINGS_MODULE=poms_app.settings # remove after change manage.py location
       - INSTANCE_TYPE=beat
+    depends_on:
+      - db
+      - rabbitmq
+      - redis
 
   migration:
     build: .
     env_file:
       - .env
     environment:
-      - INSTANCE_TYPE=job
+      - DJANGO_SETTINGS_MODULE=poms_app.settings # remove after change manage.py location
+      - INSTANCE_TYPE=job    
+    depends_on:
+      - db
+      - redis
+    
+  db:
+    image: postgres:13-alpine
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
+      POSTGRES_DB: finmars_dev
+      POSTGRESQL_MAX_OPEN_CONNS: 500
+    stdin_open: true
+    tty: true
+    ports:
+      - "5432:5432"
+    volumes:
+      - ./postgres_data:/var/lib/postgresql/data
+
+  rabbitmq:
+    image: rabbitmq
+    ports:
+      - "5672:5672"
+    stdin_open: true
+    tty: true
+
+  redis:
+    image: redis
+    ports:
+      - "6379:6379"
+    stdin_open: true
+    tty: true
 
 volumes:
   postgres_data:

docker-compose.yml

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+ENV_FILE=".env"
+ENV_SAMPLE_FILE=".env.sample"
+
+if [ -f "$ENV_FILE" ]; then
+  read -p "$ENV_FILE already exists. Overwrite? (y/N): " ans
+  if [[ "$ans" != "y" && "$ans" != "Y" ]]; then
+    echo "Skipped creating $ENV_FILE."
+    exit 0
+  fi
+fi
+
+cp "$ENV_SAMPLE_FILE" "$ENV_FILE"
+
+SECRET_KEY=$(openssl rand -base64 64 | tr -dc 'a-zA-Z0-9!@#$%^&*(-_=+)' | head -c 50)
+
+sed -i.bak "s|YOUR_DJANGO_SECRET_KEY|$SECRET_KEY|" "$ENV_FILE"
+rm "${ENV_FILE}.bak"
+
+echo "$ENV_FILE created with new SECRET_KEY."

generate_env.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+set -e
+
+echo "🚀 Starting PostgreSQL container..."
+docker compose up -d db
+
+echo "⏳ Waiting for PostgreSQL to be ready..."
+until docker exec $(docker compose ps -q db) pg_isready -U postgres > /dev/null 2>&1; do
+  sleep 1
+done
+
+echo "✅ PostgreSQL is ready."
+
+echo "📦 Creating database..."
+echo "🔍 Checking if database 'core_realm00000' exists..."
+if docker exec -i $(docker compose ps -q db) psql -U postgres -tAc "SELECT 1 FROM pg_database WHERE datname = 'core_realm00000'" | grep -q 1; then
+  echo "✅ Database 'core_realm00000' already exists."
+else
+  echo "➕ Creating database 'core_realm00000'..."
+  docker exec -i $(docker compose ps -q db) psql -U postgres -c "CREATE DATABASE core_realm00000;"
+fi
+
+echo "🚚 Importing from data from dump"
+docker exec -i $(docker compose ps -q db) psql -U postgres -d core_realm00000 < ./core.sql
+
+docker compose down
+echo "✅ Done!"

import-sql.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+set -e
+
+echo "🚀 Starting Redis container..."
+docker compose up -d redis
+
+echo "🚀 Starting PostgreSQL container..."
+docker compose up -d db
+
+echo "⏳ Waiting for PostgreSQL to be ready..."
+until docker exec $(docker compose ps -q db) pg_isready -U postgres > /dev/null 2>&1; do
+  sleep 1
+done
+
+echo "✅ PostgreSQL is ready."
+
+echo "📦 Creating database..."
+echo "🔍 Checking if database 'core_realm00000' exists..."
+if docker exec -i $(docker compose ps -q db) psql -U postgres -tAc "SELECT 1 FROM pg_database WHERE datname = 'core_realm00000'" | grep -q 1; then
+  echo "✅ Database 'core_realm00000' already exists."
+else
+  echo "➕ Creating database 'core_realm00000'..."
+  docker exec -i $(docker compose ps -q db) psql -U postgres -c "CREATE DATABASE core_realm00000;"
+fi
+
+echo "🚚 Running migration"
+docker compose run --build --rm migration 
+
+docker compose down
+echo "✅ Done!"