From cee1265b7f1f27b03afbf915e54f96f3dd2dd0b1 Mon Sep 17 00:00:00 2001
From: Tokiniaina <rakotoarisoa.tokiniaina@ethumada.com>
Date: Thu, 24 Oct 2024 14:55:38 +0300
Subject: [PATCH] Change CI

---
 .gitea/workflows/ci.yaml |  6 +-----
 Dockerfile               |  3 ---
 tests/docker-compose.yml | 15 +++++----------
 3 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/.gitea/workflows/ci.yaml b/.gitea/workflows/ci.yaml
index bda32e1..f954c7b 100644
--- a/.gitea/workflows/ci.yaml
+++ b/.gitea/workflows/ci.yaml
@@ -47,11 +47,7 @@ jobs:
           load: true
       - name: Tests
         run: |
-          docker run -v $(PWD)/tests:/mnt/tests \
-          --network=host \
-          -e PGHOST=localhost \
-          ${{ env.TAGS }}:latest \
-          /mnt/tests/runtests.sh
+          docker run --name test --network=host -v "$(pwd):/mnt" -w /mnt/tests --rm odoo17 ./runtests.sh   
       - name: Push image
         uses: docker/build-push-action@v6
         with:
diff --git a/Dockerfile b/Dockerfile
index c371a35..983160f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,6 +3,3 @@ FROM odoo:17.0
 # Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf
 
 RUN pip install mygeotab
-
-ENTRYPOINT ["/entrypoint.sh"]
-CMD ["odoo"]
\ No newline at end of file
diff --git a/tests/docker-compose.yml b/tests/docker-compose.yml
index 4808b47..f5cff83 100644
--- a/tests/docker-compose.yml
+++ b/tests/docker-compose.yml
@@ -1,19 +1,14 @@
 services:
   test:
-    image: registry.ethumada.com/odoo/odoo17co:latest
-    # build:
-    #   context: ..
-    #   args:
-    #     codename: jammy
-    #     python_version: "3.10"
-    #     odoo_version: "16.0"
+    image: odoo17
     volumes:
-      - ..:/mnt/odoo
-    working_dir: /mnt/odoo/tests
+      - ..:/mnt
+    working_dir: /mnt/tests
     depends_on:
       - postgres
+    command: ["./runtests.sh"]
   postgres:
-    image: postgres
+    image: postgres:15
     environment:
       POSTGRES_USER: odoo
       POSTGRES_PASSWORD: odoo