From 92684cffd01c242b306497ad111aff5669e7003c Mon Sep 17 00:00:00 2001
From: Guillaume Lours <guillaume.lours@docker.com>
Date: Fri, 5 Nov 2021 21:58:53 +0100
Subject: [PATCH] add support of arm64 architecture for nginx-aspnet-mysql

Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
---
 nginx-aspnet-mysql/README.md                | 10 +++++++++-
 nginx-aspnet-mysql/backend/aspnetapp.csproj |  2 +-
 nginx-aspnet-mysql/docker-compose.yaml      | 12 ++++++++----
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/nginx-aspnet-mysql/README.md b/nginx-aspnet-mysql/README.md
index ea7fcab..abf3a1a 100644
--- a/nginx-aspnet-mysql/README.md
+++ b/nginx-aspnet-mysql/README.md
@@ -24,7 +24,10 @@ services:
     build: backend
     ...
   db:
-    image: mysql:8.0.19
+    # We use a mariadb image which support both amd64 & arm64 architecture
+    image: mariadb:10.6.4-focal
+    # If you really want to use MySQL, uncomment the following line
+    #image: mysql:8.0.27
     ...
   proxy:
     build: proxy
@@ -36,6 +39,11 @@ The compose file defines an application with three services `proxy`, `backend` a
 When deploying the application, docker-compose maps port 80 of the proxy service container to port 80 of the host as specified in the file.
 Make sure port 80 on the host is not already being in use.
 
+> ℹ️ **_INFO_**  
+> For compatibility purpose between `AMD64` and `ARM64` architecture, we use a MariaDB as database instead of MySQL.  
+> You still can use the MySQL image by uncommenting the following line in the Compose file   
+> `#image: mysql:8.0.27`
+
 ## Deploy with docker-compose
 
 ```
diff --git a/nginx-aspnet-mysql/backend/aspnetapp.csproj b/nginx-aspnet-mysql/backend/aspnetapp.csproj
index 25b2321..1d82f20 100644
--- a/nginx-aspnet-mysql/backend/aspnetapp.csproj
+++ b/nginx-aspnet-mysql/backend/aspnetapp.csproj
@@ -3,6 +3,6 @@
     <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="MySql.Data" Version="8.0.23" />
+    <PackageReference Include="MySqlConnector" Version="0.61.0" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/nginx-aspnet-mysql/docker-compose.yaml b/nginx-aspnet-mysql/docker-compose.yaml
index b35855c..8bf2f62 100644
--- a/nginx-aspnet-mysql/docker-compose.yaml
+++ b/nginx-aspnet-mysql/docker-compose.yaml
@@ -1,17 +1,21 @@
 services:
   backend:
     build: backend
+    restart: always
     secrets:
       - db-password
     depends_on: 
       - db
     environment:
       - ASPNETCORE_URLS=http://+:8000
-    depends_on:
-      db:
-        condition: service_healthy
+#    depends_on:
+#      db:
+#        condition: service_healthy
   db:
-    image: mysql:8.0.19
+    # We use a mariadb image which support both amd64 & arm64 architecture
+    image: mariadb:10.6.4-focal
+    # If you really want to use MySQL, uncomment the following line
+    #image: mysql:8.0.27
     command: '--default-authentication-plugin=mysql_native_password'
     restart: always
     healthcheck: