From 3c23ef79f93fddc2b5d36789d6a7a649d8ac3a79 Mon Sep 17 00:00:00 2001 From: Colin Wilson Date: Tue, 5 Nov 2019 14:15:10 +0000 Subject: [PATCH] Upgrade Craft to 2.7.10; Update MariaDB to 10.4.8; Update Redis to 5.0.6 --- CHANGELOG.md | 6 ++++++ Dockerfile | 2 +- README.md | 6 +++--- docker-compose.yml | 4 ++-- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d271212..95e58b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## [0.4.4] - 05-11-2019 +### Update +- Upgrade Craft to [2.7.10](https://github.com/craftcms/cms/blob/master-v2/CHANGELOG-v2.md) +- Upgrade MariaDB to [10.4.8](https://mariadb.com/kb/en/library/mariadb-1043-release-notes/) +- Upgrade Redis to [5.0.6](https://raw.githubusercontent.com/antirez/redis/5.0/00-RELEASENOTES) + ## [0.4.3] - 02-03-2019 ### Update - Upgrade Craft to [2.7.5](https://github.com/craftcms/cms/blob/master-v2/CHANGELOG-v2.md) diff --git a/Dockerfile b/Dockerfile index d8c7cb2..b6ba5c8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM wyveo/nginx-php-fpm:php72 MAINTAINER Colin Wilson "colin@wyveo.com" # Set craft cms version -ENV CRAFT_VERSION=2.7 CRAFT_BUILD=5 +ENV CRAFT_VERSION=2.7 CRAFT_BUILD=10 ENV CRAFT_ZIP=Craft-$CRAFT_VERSION.$CRAFT_BUILD.zip diff --git a/README.md b/README.md index 61cce31..e86456c 100644 --- a/README.md +++ b/README.md @@ -4,12 +4,12 @@ This is a [Craft 3](https://craftcms.com/3) / [Craft 2](https://craftcms.com/) #### Versioning | Docker Tag | Git Branch | Craft Release | Database | Caching | |-----|-------|-----|--------|--------| -| latest | craft3 | 3.1.15 | PostgreSQL 10.7 | Redis 5.0.3 | -| craft2 | craft2 | 2.7.5 | MariaDB 10.4.3 | Redis 4.0.13 | +| latest | craft3 | 3.3.14 | PostgreSQL 11.5 | Redis 5.0.6 | +| craft2 | craft2 | 2.7.10 | MariaDB 10.4.8 | Redis 5.0.6 | Features: - - Nginx 1.15.x, PHP-FPM 7.3.x, Git 2.11.0 + - Nginx 1.17.x, PHP-FPM 7.3.x, Git 2.11.0 - imageMagick image manipulation library ## Clone repo and run diff --git a/docker-compose.yml b/docker-compose.yml index 1db6c43..fc579f9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -32,7 +32,7 @@ services: DB_PASS: secret mariadb: - image: mariadb:10.4.3 + image: mariadb:10.4.8 environment: MYSQL_ROOT_PASSWORD: root MYSQL_USER: craft @@ -43,6 +43,6 @@ services: - mariadb-data:/var/lib/mysql/data redis: - image: redis:4.0.13-alpine + image: redis:5.0.6-alpine volumes: - /data:/data