From 71b9cd754c515f8dcf8e28e5bcc917b83ad810cb Mon Sep 17 00:00:00 2001
From: orousseau49170 <68322601+orousseau49170@users.noreply.github.com>
Date: Thu, 19 Dec 2024 15:07:11 +0100
Subject: [PATCH 1/3] #56

New version of mysql + activation of database service
---
 examples/docker-compose.yml    | 26 ++++++++++++++------------
 src/databases/mysql/Dockerfile |  3 ++-
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/examples/docker-compose.yml b/examples/docker-compose.yml
index 3785adf..48308da 100644
--- a/examples/docker-compose.yml
+++ b/examples/docker-compose.yml
@@ -33,21 +33,23 @@ services:
           - ext-payment-2
   loader:
     image: ghcr.io/cisco-open/app-simulator-loaders-curl:latest
-    pull_policy: build
     build:
       context: ../src/loaders/curl
       dockerfile: Dockerfile
+    environment:
+      - URLS=https://frontend:8080/addtocart http://frontend:8080/checkout
+      - SLEEP=5
+      - WAIT=1
+  backend-db:
+    image: ghcr.io/cisco-open/app-simulator-databases-mysql:latest
+    environment:
+      - MYSQL_ROOT_PASSWORD=root
+    build:
+      context: ../src/databases/mysql
+      dockerfile: Dockerfile
+    ports:
+      - "3306:3306"
     volumes:
-      - ./loader.json:/config.json
-    
-#  backend-db:
-#    image: ghcr.io/cisco-open/app-simulator-databases-mysql:latest
-#    build:
-#      context: ../src/databases/mysql
-#      dockerfile: Dockerfile
-#    ports:
-#      - "3306:3306"
-#    volumes:
-#     - ./backend-db.json:/config.json
+     - ./database.json:/config.json
 networks:
   default:
diff --git a/src/databases/mysql/Dockerfile b/src/databases/mysql/Dockerfile
index 5760d1e..b9060c7 100644
--- a/src/databases/mysql/Dockerfile
+++ b/src/databases/mysql/Dockerfile
@@ -1,9 +1,10 @@
-FROM mysql:5.7
+FROM --platform=linux/amd64 mysql:5.7
 
 LABEL org.opencontainers.image.source=https://github.com/cisco-open/app-simulator
 LABEL org.opencontainers.image.description="mysql database for app-simulator"
 LABEL org.opencontainers.image.licenses=BSD-3-Clause
 
 RUN yum install -y php-cli && yum clean all
+
 COPY setup.php /tmp/
 COPY setup.sh /docker-entrypoint-initdb.d/

From 47a5ec5342a5f6c01934dfb6b728f96093fd4243 Mon Sep 17 00:00:00 2001
From: orousseau49170 <68322601+orousseau49170@users.noreply.github.com>
Date: Thu, 19 Dec 2024 17:47:36 +0100
Subject: [PATCH 2/3] Update docker-compose.yml

---
 examples/docker-compose.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/examples/docker-compose.yml b/examples/docker-compose.yml
index 48308da..8a2842d 100644
--- a/examples/docker-compose.yml
+++ b/examples/docker-compose.yml
@@ -33,6 +33,7 @@ services:
           - ext-payment-2
   loader:
     image: ghcr.io/cisco-open/app-simulator-loaders-curl:latest
+    pull_policy: build
     build:
       context: ../src/loaders/curl
       dockerfile: Dockerfile

From 9c623a6790cc6e8036f32f5bf35bd7e6aa5c6c39 Mon Sep 17 00:00:00 2001
From: orousseau49170 <68322601+orousseau49170@users.noreply.github.com>
Date: Fri, 20 Dec 2024 11:41:09 +0100
Subject: [PATCH 3/3] Update docker-compose.yml

Parameters defined in loader.json
---
 examples/docker-compose.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/examples/docker-compose.yml b/examples/docker-compose.yml
index 8a2842d..44309b3 100644
--- a/examples/docker-compose.yml
+++ b/examples/docker-compose.yml
@@ -37,10 +37,6 @@ services:
     build:
       context: ../src/loaders/curl
       dockerfile: Dockerfile
-    environment:
-      - URLS=https://frontend:8080/addtocart http://frontend:8080/checkout
-      - SLEEP=5
-      - WAIT=1
   backend-db:
     image: ghcr.io/cisco-open/app-simulator-databases-mysql:latest
     environment: