afup#1416 CI env

stakovicz · Jan 8, 2024 · b3b3502 · b3b3502
1 parent c5214bc
commit b3b3502
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/Makefile b/Makefile
@@ -74,8 +74,8 @@ test:
 test-functional: data config htdocs/uploads
 	CURRENT_UID=$(CURRENT_UID) $(DOCKER_COMPOSE_BIN) stop dbtest apachephptest planetetest mailcatcher
 	CURRENT_UID=$(CURRENT_UID) $(DOCKER_COMPOSE_BIN) up -d dbtest apachephptest planetetest mailcatcher
-	CURRENT_UID=$(CURRENT_UID) $(DOCKER_COMPOSE_BIN) run --no-deps --rm apachephptest ./bin/behat
-	CURRENT_UID=$(CURRENT_UID) $(DOCKER_COMPOSE_BIN) run --no-deps --rm planetetest ./bin/behat -c behat-planete.yml
+	CURRENT_UID=$(CURRENT_UID) $(DOCKER_COMPOSE_BIN) run --no-deps --rm cliphp ./bin/behat
+	CURRENT_UID=$(CURRENT_UID) $(DOCKER_COMPOSE_BIN) run --no-deps --rm cliphp ./bin/behat -c behat-planete.yml
 	CURRENT_UID=$(CURRENT_UID) $(DOCKER_COMPOSE_BIN) stop dbtest apachephptest planetetest mailcatcher
 
 data:

diff --git a/compose.yml b/compose.yml
@@ -4,20 +4,20 @@ services:
   db:
     build: ./docker/dockerfiles/mysql
     environment:
-      MYSQL_ROOT_PASSWORD: root
-      MYSQL_USER: afup
-      MYSQL_PASSWORD: afup
-      MYSQL_DATABASE: web
+      - MYSQL_ROOT_PASSWORD=root
+      - MYSQL_USER=afup
+      - MYSQL_PASSWORD=afup
+      - MYSQL_DATABASE=web
     volumes:
       - ./data/mysql:/var/lib/mysql
 
   dbtest:
     build: ./docker/dockerfiles/mysqltest
     environment:
-      MYSQL_ROOT_PASSWORD: root
-      MYSQL_USER: afup
-      MYSQL_PASSWORD: afup
-      MYSQL_DATABASE: web
+      - MYSQL_ROOT_PASSWORD=root
+      - MYSQL_USER=afup
+      - MYSQL_PASSWORD=afup
+      - MYSQL_DATABASE=web
     volumes:
       - ./data/mysqltest:/var/lib/mysql
     healthcheck:
@@ -33,7 +33,7 @@ services:
         gid: "1001"
         ENABLE_XDEBUG: ${ENABLE_XDEBUG:-false}
     environment:
-      SYMFONY_ENV: "dev"
+      - SYMFONY_ENV=dev
     volumes:
       - ./:/var/www/html
     links:
@@ -48,7 +48,7 @@ services:
         gid: "1001"
         ENABLE_XDEBUG: ${ENABLE_XDEBUG:-false}
     environment:
-      SYMFONY_ENV: "test"
+      - SYMFONY_ENV=test
     volumes:
       - ./:/var/www/html
     healthcheck:
@@ -67,7 +67,7 @@ services:
         uid: ${CURRENT_UID:-1001}
         gid: "1001"
     environment:
-      SYMFONY_ENV: "dev"
+      - SYMFONY_ENV=dev
     volumes:
       - ./:/var/www/html
     links:
@@ -82,7 +82,7 @@ services:
         gid: "1001"
         ENABLE_XDEBUG: ${ENABLE_XDEBUG:-false}
     environment:
-      SYMFONY_ENV: "test"
+      - SYMFONY_ENV=test
     volumes:
       - ./:/var/www/html
     healthcheck: