Use prestashop/prestashop image

PrestaShop · Jan 24, 2024 · 1fdcc74 · 1fdcc74
1 parent 67592e3
commit 1fdcc74
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/.github/workflows/ui-test.yml b/.github/workflows/ui-test.yml
@@ -27,7 +27,7 @@ jobs:
       - name: Start containers
         run: |
           docker-compose -f "docker-compose.yml" up -d --build
-          while ! nc -z localhost 8000; do sleep 1; done;
+          while ! nc -z localhost 80; do sleep 1; done;
         working-directory: tests/UI/
 
       - name: Install dependencies

diff --git a/tests/UI/docker-compose.yml b/tests/UI/docker-compose.yml
@@ -2,21 +2,30 @@ version: '3.7'
 
 services:
   prestashop:
-    image: prestashop/prestashop-flashlight:${PS_VERSION}
+    image: prestashop/prestashop:${PS_VERSION}-apache
     container_name: prestashop
     depends_on: 
       - mysql
     environment:
-      - DEBUG_MODE=true
-      - PS_DOMAIN=localhost:8000
+      - PS_DEV_MODE=1
+      - PS_DOMAIN=localhost
+      - PS_LANGUAGE=en
+      - PS_COUNTRY=fr
+      - PS_INSTALL_AUTO=1
+      - ADMIN_MAIL=admin@prestashop.com
+      - ADMIN_PASSWD=prestashop
+      - DB_SERVER=mysql
+      - DB_USER=prestashop
+      - DB_PASSWD=prestashop
+      - DB_NAME=prestashop
     volumes:
       - type: bind
         # Local Path 
         source: ../../
         # Mount Path
         target: /var/www/html/modules/blockwishlist
     ports:
-      - 8000:80
+      - 80:80
   mysql:
     image: mariadb:lts
     container_name: prestashop-mysql

diff --git a/tests/UI/playwright.config.ts b/tests/UI/playwright.config.ts
@@ -4,7 +4,7 @@ import path from 'path';
 
 function loadGlobal(): void  {
   global.FO = {
-    URL: process.env.URL_FO || 'http://localhost:8000/',
+    URL: process.env.URL_FO || 'http://localhost/',
   };
 
   /*