From 6de1e73befd63e0149e5ab113d0ecb3002df99eb Mon Sep 17 00:00:00 2001
From: kev <vimagick@gmail.com>
Date: Fri, 16 Apr 2021 15:53:26 +0800
Subject: [PATCH] update mantisbt

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

diff --git a/mantisbt/Dockerfile b/mantisbt/Dockerfile
index a9493a9..552a57e 100644
--- a/mantisbt/Dockerfile
+++ b/mantisbt/Dockerfile
@@ -2,8 +2,8 @@
 # Dockerfile for mantisbt
 #
 
-FROM php:5.6-apache
-MAINTAINER kev <noreply@easypi.pro>
+FROM php:7.2-apache
+MAINTAINER EasyPi Software Foundation
 
 RUN a2enmod rewrite
 
@@ -14,10 +14,10 @@ RUN set -xe \
     && docker-php-ext-install gd mbstring mysql mysqli pgsql soap \
     && rm -rf /var/lib/apt/lists/*
 
-ENV MANTIS_VER 2.22.1
-ENV MANTIS_MD5 ced6493cb2c1ea6bbf8b95b5082e7d98
-ENV MANTIS_URL https://sourceforge.net/projects/mantisbt/files/mantis-stable/${MANTIS_VER}/mantisbt-${MANTIS_VER}.tar.gz
-ENV MANTIS_FILE mantisbt.tar.gz
+ENV MANTIS_VERSION=2.25.0
+ENV MANTIS_MD5=a3e4b5c4f91b5d04c37122650cb1189d
+ENV MANTIS_URL=https://sourceforge.net/projects/mantisbt/files/mantis-stable/${MANTIS_VERSION}/mantisbt-${MANTIS_VERSION}.tar.gz
+ENV MANTIS_FILE=mantisbt.tar.gz
 
 RUN set -xe \
     && curl -fSL ${MANTIS_URL} -o ${MANTIS_FILE} \
diff --git a/mantisbt/README.md b/mantisbt/README.md
index c1f04e4..391e663 100644
--- a/mantisbt/README.md
+++ b/mantisbt/README.md
@@ -7,24 +7,28 @@ a delicate balance between simplicity and power.
 ## docker-compose.yml
 
 ```yaml
-mantisbt:
-  image: vimagick/mantisbt:latest
-  ports:
-    - "8989:80"
-  links:
-    - mysql
-  restart: always
+version: "3.8"
 
-mysql:
-  image: mysql:5.7
-  volumes:
-    - ./data:/var/lib/mysql
-  environment:
-    - MYSQL_ROOT_PASSWORD=root
-    - MYSQL_DATABASE=bugtracker
-    - MYSQL_USER=mantisbt
-    - MYSQL_PASSWORD=mantisbt
-  restart: always
+services:
+
+  mantisbt:
+    image: vimagick/mantisbt
+    ports:
+      - "8989:80"
+    depends_on:
+      - mysql
+    restart: unless-stopped
+
+  mysql:
+    image: mysql
+    volumes:
+      - ./data:/var/lib/mysql
+    environment:
+      - MYSQL_ROOT_PASSWORD=root
+      - MYSQL_DATABASE=bugtracker
+      - MYSQL_USER=mantis
+      - MYSQL_PASSWORD=mantis
+    restart: unless-stopped
 ```
 
 > You can use `mariadb`/`postgres` instead of `mysql`.
diff --git a/mantisbt/docker-compose.yml b/mantisbt/docker-compose.yml
index fa7a523..e8579d3 100644
--- a/mantisbt/docker-compose.yml
+++ b/mantisbt/docker-compose.yml
@@ -1,18 +1,22 @@
-mantisbt:
-  image: vimagick/mantisbt:latest
-  ports:
-    - "8989:80"
-  links:
-    - mysql
-  restart: always
+version: "3.8"
 
-mysql:
-  image: mysql:5.7
-  volumes:
-    - ./data:/var/lib/mysql
-  environment:
-    - MYSQL_ROOT_PASSWORD=root
-    - MYSQL_DATABASE=bugtracker
-    - MYSQL_USER=mantis
-    - MYSQL_PASSWORD=mantis
-  restart: always
+services:
+
+  mantisbt:
+    image: vimagick/mantisbt
+    ports:
+      - "8989:80"
+    depends_on:
+      - mysql
+    restart: unless-stopped
+
+  mysql:
+    image: mysql
+    volumes:
+      - ./data:/var/lib/mysql
+    environment:
+      - MYSQL_ROOT_PASSWORD=root
+      - MYSQL_DATABASE=bugtracker
+      - MYSQL_USER=mantis
+      - MYSQL_PASSWORD=mantis
+    restart: unless-stopped