Added e2e tests GH action, with docker compose build - debugging action

datakind · Jul 1, 2024 · 043ca0b · 043ca0b
1 parent 4b39d8a
commit 043ca0b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 16 deletions.
diff --git a/.github/workflows/e2e_tests.yml b/.github/workflows/e2e_tests.yml
@@ -98,7 +98,8 @@ jobs:
             # TODO docker-compose files should be refactored to use scopes instead of different versions for each environment
             docker-compose -f ./docker-compose-github.yml up -d  
             echo "logs datadb ..."
-            docker-compose -f docker-compose-github.yml  logs datadb
+            docker logs datadb
+            #docker-compose -f docker-compose-github.yml  logs datadb
 
         # - name: Run the stack
         #   run: |

diff --git a/docker-compose-github.yml b/docker-compose-github.yml
@@ -18,21 +18,22 @@ services:
       - ./management/skills.py:/app/chainlit-ui-evaluation/recipes/skills.py
       - ./ui/chat-chainlit-assistant/app.py:/app/chainlit-ui-evaluation/app.py
 
-  # datadb:
-  #   platform: linux/amd64
-  #   image: postgis/postgis:12-3.4
-  #   container_name: recipes-ai-datadb
-  #   environment:
-  #     POSTGRES_DB: ${POSTGRES_DATA_DB}
-  #     POSTGRES_USER: ${POSTGRES_DATA_USER}
-  #     POSTGRES_PASSWORD: ${POSTGRES_DATA_PASSWORD}
-  #   restart: always
-  #   ports:
-  #     - 5433:5432
-  #   #volumes:
-  #   #  - ./data/datadb:/var/lib/postgresql/data
-  #   env_file:
-  #     - .env
+  # This is actually pulled as a service in the GH action. This is here so up will start it
+  datadb:
+    platform: linux/amd64
+    image: postgis/postgis:12-3.4
+    container_name: recipes-ai-datadb
+    environment:
+      POSTGRES_DB: ${POSTGRES_DATA_DB}
+      POSTGRES_USER: ${POSTGRES_DATA_USER}
+      POSTGRES_PASSWORD: ${POSTGRES_DATA_PASSWORD}
+    restart: always
+    ports:
+      - 5433:5432
+    #volumes:
+    #  - ./data/datadb:/var/lib/postgresql/data
+    env_file:
+      - .env
 
   recipedb:
     platform: linux/amd64