From 9d94a8a87ae081236673bca371d97b83b86a1ffe Mon Sep 17 00:00:00 2001
From: kev <vimagick@gmail.com>
Date: Fri, 16 Apr 2021 15:47:27 +0800
Subject: [PATCH] update opencart

---
 opencart/Dockerfile         | 12 ++++++------
 opencart/README.md          | 34 ++++++++++++++++++++-------------
 opencart/docker-compose.yml | 38 ++++++++++++++++++++-----------------
 3 files changed, 48 insertions(+), 36 deletions(-)

diff --git a/opencart/Dockerfile b/opencart/Dockerfile
index adef0d6..a9b0d4d 100644
--- a/opencart/Dockerfile
+++ b/opencart/Dockerfile
@@ -3,7 +3,7 @@
 #
 
 FROM php:7.2-apache
-MAINTAINER kev <noreply@easypi.pro>
+MAINTAINER EasyPi Software Foundation
 
 RUN a2enmod rewrite
 
@@ -13,15 +13,15 @@ RUN set -xe \
     && rm -rf /var/lib/apt/lists/* \
     && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
     && docker-php-ext-install gd mbstring mysqli zip \
-    && pecl install mcrypt-1.0.1 \
+    && pecl install mcrypt-1.0.4 \
     && docker-php-ext-enable mcrypt
 
 WORKDIR /var/www/html
 
-ENV OPENCART_VER 3.0.2.0
-ENV OPENCART_MD5 41c7e7ec49d389fc4c2204efb40289e6
-ENV OPENCART_URL https://github.com/opencart/opencart/archive/${OPENCART_VER}.tar.gz
-ENV OPENCART_FILE opencart.tar.gz
+ENV OPENCART_VERSION=3.0.3.7
+ENV OPENCART_MD5=52288349b779a4517d4b7987253caceb
+ENV OPENCART_URL=https://github.com/opencart/opencart/archive/${OPENCART_VERSION}.tar.gz
+ENV OPENCART_FILE=opencart.tar.gz
 
 RUN set -xe \
     && curl -sSL ${OPENCART_URL} -o ${OPENCART_FILE} \
diff --git a/opencart/README.md b/opencart/README.md
index 3ecd7a6..f1e7b12 100644
--- a/opencart/README.md
+++ b/opencart/README.md
@@ -7,20 +7,28 @@ friendly and with a visually appealing interface.
 ## docker-compose.yml
 
 ```yaml
-opencart:
-  image: vimagick/opencart
-  ports:
-    - "8000:80"
-  links:
-    - mysql
-  restart: always
+version: "3.8"
 
-mysql:
-  image: mysql
-  environment:
-    - MYSQL_ROOT_PASSWORD=root
-    - MYSQL_DATABASE=opencart
-  restart: always
+services:
+
+  opencart:
+    image: vimagick/opencart
+    ports:
+      - "8000:80"
+    volumes:
+      - /var/www
+    depends_on:
+      - mysql
+    restart: unless-stopped
+
+  mysql:
+    image: mysql
+    volumes:
+      - ./data:/var/lib/mysql
+    environment:
+      - MYSQL_ROOT_PASSWORD=root
+      - MYSQL_DATABASE=opencart
+    restart: unless-stopped
 ```
 
 [1]: http://www.opencart.com/index.php
diff --git a/opencart/docker-compose.yml b/opencart/docker-compose.yml
index cd2bd7b..fe3e920 100644
--- a/opencart/docker-compose.yml
+++ b/opencart/docker-compose.yml
@@ -1,18 +1,22 @@
-opencart:
-  image: vimagick/opencart
-  ports:
-    - "8000:80"
-  links:
-    - mysql
-  volumes:
-    - /var/www
-  restart: always
+version: "3.8"
 
-mysql:
-  image: mysql
-  volumes:
-    - ./data:/var/lib/mysql
-  environment:
-    - MYSQL_ROOT_PASSWORD=root
-    - MYSQL_DATABASE=opencart
-  restart: always
+services:
+
+  opencart:
+    image: vimagick/opencart
+    ports:
+      - "8000:80"
+    volumes:
+      - /var/www
+    depends_on:
+      - mysql
+    restart: unless-stopped
+
+  mysql:
+    image: mysql
+    volumes:
+      - ./data:/var/lib/mysql
+    environment:
+      - MYSQL_ROOT_PASSWORD=root
+      - MYSQL_DATABASE=opencart
+    restart: unless-stopped