From 6a5b3cbd11145c1a5395c426f59fa6d2ed3de23b Mon Sep 17 00:00:00 2001
From: kev <vimagick@gmail.com>
Date: Tue, 13 Apr 2021 15:23:19 +0800
Subject: [PATCH] update prestashop

---
 prestashop/README.md          | 37 ++++++++++++++++++++---------------
 prestashop/docker-compose.yml | 37 ++++++++++++++++++++---------------
 2 files changed, 42 insertions(+), 32 deletions(-)

diff --git a/prestashop/README.md b/prestashop/README.md
index ac822ac..0f8e382 100644
--- a/prestashop/README.md
+++ b/prestashop/README.md
@@ -8,23 +8,28 @@ free.
 ## docker-compose.yml
 
 ```yaml
-prestashop:
-  image: prestashop/prestashop:1.7-7.2-apache
-  ports:
-    - "8080:80"
-  links:
-    - mysql
-  volumes:
-    - ./data:/var/www/html
-  restart: unless-stopped
+version: "3.8"
 
-mysql:
-  image: mysql:8
-  command: --default-authentication-plugin=mysql_native_password
-  environment:
-    - MYSQL_ROOT_PASSWORD=root
-    - MYSQL_DATABASE=prestashop
-  restart: unless-stopped
+services:
+
+  prestashop:
+    image: prestashop/prestashop:1.7-apache
+    ports:
+      - "8080:80"
+    volumes:
+      - ./data/prestashop:/var/www/html
+    depends_on:
+      - mysql
+    restart: unless-stopped
+
+  mysql:
+    image: mariadb:10
+    volumes:
+      - ./data/mysql:/var/lib/mysql
+    environment:
+      - MYSQL_ROOT_PASSWORD=root
+      - MYSQL_DATABASE=prestashop
+    restart: unless-stopped
 ```
 
 ## Nginx Config
diff --git a/prestashop/docker-compose.yml b/prestashop/docker-compose.yml
index 17a2328..5e6e8b8 100644
--- a/prestashop/docker-compose.yml
+++ b/prestashop/docker-compose.yml
@@ -1,17 +1,22 @@
-prestashop:
-  image: prestashop/prestashop:1.7-7.2-apache
-  ports:
-    - "8080:80"
-  links:
-    - mysql
-  volumes:
-    - ./data:/var/www/html
-  restart: unless-stopped
+version: "3.8"
 
-mysql:
-  image: mysql:8
-  command: --default-authentication-plugin=mysql_native_password
-  environment:
-    - MYSQL_ROOT_PASSWORD=root
-    - MYSQL_DATABASE=prestashop
-  restart: unless-stopped
+services:
+
+  prestashop:
+    image: prestashop/prestashop:1.7-apache
+    ports:
+      - "8080:80"
+    volumes:
+      - ./data/prestashop:/var/www/html
+    depends_on:
+      - mysql
+    restart: unless-stopped
+
+  mysql:
+    image: mariadb:10
+    volumes:
+      - ./data/mysql:/var/lib/mysql
+    environment:
+      - MYSQL_ROOT_PASSWORD=root
+      - MYSQL_DATABASE=prestashop
+    restart: unless-stopped