From 40899dd97240b609519c88a0b97a171ea77c76cc Mon Sep 17 00:00:00 2001
From: Ferror <zmalcherczyk@gmail.com>
Date: Tue, 10 May 2022 15:10:33 +0200
Subject: [PATCH] [docker]Run tests in test_cached environment

---
 docker-compose.test.yml |  7 ++++---
 docker-compose.yml      | 24 ++++++++++++------------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index 97c284bf1f..0b5b1d51d7 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -3,8 +3,9 @@ services:
         image: sylius/standard:1.11-traditional
         entrypoint: ["make", "ci"]
         environment:
-            APP_ENV: "test"
-            DATABASE_URL: "mysql://root:mysql@mysql/sylius_test"
+            APP_ENV: "test_cached"
+            APP_DEBUG: 0
+            DATABASE_URL: "mysql://root:mysql@mysql/sylius_%kernel.environment%?charset=utf8mb4"
             PHP_DATE_TIMEZONE: "Europe/Warsaw"
         volumes:
             - ./:/app:delegated
@@ -21,7 +22,7 @@ services:
         image: mysql:5.7
         platform: linux/amd64
         environment:
-            - MYSQL_ROOT_PASSWORD=mysql
+            MYSQL_ROOT_PASSWORD: mysql
         ports:
             - 3306:3306
         networks:
diff --git a/docker-compose.yml b/docker-compose.yml
index 9c6b0252b0..c67fe4de36 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,8 +3,8 @@ services:
         image: sylius/standard:1.11-traditional
         environment:
             APP_ENV: "dev"
-            DATABASE_URL: "mysql://root:mysql@mysql/sylius_%kernel.environment%"
-#            DATABASE_URL: "pgsql://root:postgres@postgres/sylius_%kernel.environment%" # When using postgres
+            DATABASE_URL: "mysql://root:mysql@mysql/sylius_%kernel.environment%?charset=utf8mb4"
+#            DATABASE_URL: "pgsql://root:postgres@postgres/sylius_%kernel.environment%?charset=utf8" # When using postgres
             PHP_DATE_TIMEZONE: "Europe/Warsaw"
             MAILER_URL: "smtp://mailhog:1025"
         volumes:
@@ -22,21 +22,21 @@ services:
         image: mysql:5.7
         platform: linux/amd64
         environment:
-            - MYSQL_ROOT_PASSWORD=mysql
+            MYSQL_ROOT_PASSWORD: mysql
         ports:
             - 3306:3306
         networks:
             - sylius
     
-    #    postgres:
-    #        image: postgres:13
-    #        environment:
-    #            - POSTGRES_USER=root
-    #            - POSTGRES_PASSWORD=postgres
-    #        ports:
-    #            - 5432:5432
-    #        networks:
-    #            - sylius
+#    postgres:
+#        image: postgres:13-alpine
+#        environment:
+#            POSTGRES_USER: root
+#            POSTGRES_PASSWORD: postgres
+#        ports:
+#            - 5432:5432
+#        networks:
+#            - sylius
 
     mailhog:
         image: mailhog/mailhog