adding --wait flags

mollie · Dec 5, 2023 · bb67ddc · bb67ddc
1 parent 5bbf7a1
commit bb67ddc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 12 deletions.
diff --git a/.github/workflows/E2E_On_PR.yml b/.github/workflows/E2E_On_PR.yml
@@ -33,7 +33,6 @@ jobs:
             TestRailID: R6470
     env:
       NGROK_TOKEN: ${{ secrets.NGROK_TOKEN }}
-      DB_PASSWD: ${{ secrets.DB_PASSWD }}
     steps:
       - name: Checkout
         uses: actions/[email protected]

diff --git a/Makefile b/Makefile
@@ -7,7 +7,7 @@ fix-lint:
 #PS1785
 e2eh1785:
 	# detaching containers
-	docker-compose -f docker-compose.1785.yml up -d --force-recreate
+	docker-compose -f docker-compose.1785.yml up -d --force-recreate --wait
 	# sees what containers are running
 	docker-compose -f docker-compose.1785.yml ps
 	# waits for mysql to load
@@ -30,7 +30,7 @@ e2eh1785:
 #PS8
 e2eh8:
 	# detaching containers
-	docker-compose -f docker-compose.8.yml up -d --force-recreate
+	docker-compose -f docker-compose.8.yml up -d --force-recreate --wait
 	# sees what containers are running
 	docker-compose -f docker-compose.8.yml ps
 	# waits for mysql to load

diff --git a/docker-compose.8.yml b/docker-compose.8.yml
@@ -1,14 +1,6 @@
 version: "3.7"
 
 services:
-  node:
-    image: node:latest
-    volumes:
-      - ./:/var/www/html
-    working_dir: /var/www/html
-    environment:
-      PATH: /var/www/html/_dev/node_modules/.bin/:$PATH
-
   mysql:
     platform: linux/amd64
     container_name: mysql-mollie-8
@@ -33,7 +25,7 @@ services:
     environment:
       PS_INSTALL_AUTO: 1
       PS_ENABLE_SSL: 1
-      DB_PASSWD: $DB_PASSWD
+      DB_PASSWD: $${DB_PASSWD}
       DB_NAME: prestashop
       DB_SERVER: mysql
       PS_DOMAIN: demoshop8.ngrok.io