Merge pull request #145 from devopshobbies/dev

modify docker compose and workflows
devopshobbies · Dec 14, 2024 · 92ac807 · 92ac807
2 parents 8fbe4a0 + cbef72d
commit 92ac807
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 15 deletions.
diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml
@@ -4,6 +4,7 @@ on:
   pull_request:
     branches:
       - master
+      - dev
 
 jobs:
   build:

diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -4,6 +4,7 @@ on:
   pull_request_target:
     branches:
       - master
+      - dev
 
 jobs:
  docker_health_check:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -18,21 +18,6 @@ services:
     networks:
       - app_network
 
-  web:
-    build:
-      context: ./admin-panel
-      dockerfile: Dockerfile
-      args:
-        VITE_API_CLIENT_BASE_URL: "http://localhost:8080/api/"
-    image: web_gpt
-    container_name: web_gpt
-    ports:
-      - "80:4173"
-    depends_on:
-      - app
-    networks:
-      - app_network
-
 
 networks:
   app_network:
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ on: @@
       pull_request:
         branches:
           - master
+          - dev
     jobs:
       build:
@@ Expand Down @@