Update the project build

code4romania · Mar 14, 2024 · 7629b19 · 7629b19
1 parent 859301b
commit 7629b19
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 73 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
diff --git a/.github/workflows/codeql-analysis-js.yml b/.github/workflows/codeql-analysis-js.yml
@@ -12,8 +12,6 @@ on:
       - 'docker-compose.yml'
       - '.github/workflows/client_pipeline.yml'
       - '.github/workflows/code-analysis-js.yml'
-  schedule:
-    - cron: '0 7 * * 2'
 
 jobs:
   analyze_js:

diff --git a/.github/workflows/codeql-analysis-py.yml b/.github/workflows/codeql-analysis-py.yml
@@ -12,8 +12,6 @@ on:
       - 'docker-compose.yml'
       - '.github/workflows/api_pipeline.yml'
       - '.github/workflows/code-analysis-py.yml'
-  schedule:
-    - cron: '15 7 * * 2'
 
 jobs:
   analyze_py:

diff --git a/dk-cp.base.yml b/dk-cp.base.yml
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -5,45 +5,45 @@ services:
 
   db:
     container_name: seismic_db-dev
-    extends:
-      file: dk-cp.base.yml
-      service: db_base
+    image: postgres:15.4-bookworm
+    env_file:
+      - .env
+    volumes:
+      - pgdata:/var/lib/postgresql/data
     ports:
       - "${DB_PORT:-5444}:5432"
 
   api:
     container_name: seismic_api-dev
-    extends:
-      file: dk-cp.base.yml
-      service: api_base
     build:
       context: ./
       dockerfile: ./docker/dockerfiles/Dockerfile.backend.dev
       args:
         - ENVIRONMENT=development
     env_file:
       - .env
-      - .env.dev
     environment:
       ENVIRONMENT: "development"
+    depends_on:
+      - db
+    ports:
+      - "${API_PORT:-8030}:8000"
     volumes:
       - ./api:/var/www/seismic/api/
 
   client:
     container_name: seismic_client-dev
-    extends:
-      file: dk-cp.base.yml
-      service: client_base
     build:
       context: ./
       dockerfile: ./docker/dockerfiles/Dockerfile.frontend.dev
       args:
         - ENVIRONMENT=development
     env_file:
       - .env
-      - .env.dev
     environment:
       ENVIRONMENT: "development"
+    depends_on:
+      - api
     volumes:
       - ./client:/code
     ports: