From fe2d62ed5206da69c17a7dc05ab5be34f0becc8b Mon Sep 17 00:00:00 2001
From: Colin Wilson <colin.wilson@protonmail.ch>
Date: Fri, 20 Oct 2017 18:45:26 +0100
Subject: [PATCH] Upgrade Craft to 2.6.2993 & MariaDB

---
 CHANGELOG.md       | 11 ++++++++---
 Dockerfile         |  2 +-
 README.md          |  4 ++--
 docker-compose.yml |  2 +-
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cfe21ae..1c19bc4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## [0.3.0] - 20-10-2017
+### Update
+- Upgrade Craft to 2.6.2993
+- Upgrade MariaDB to 10.2.9
+
 ## [0.2.9] - 28-09-2017
 ### Update
 - Reverse deletion of default install template
@@ -9,7 +14,7 @@
 
 ## [0.2.7] - 02-09-2017
 ### Update
-- Upgrade MariaDB to 10.2.28
+- Upgrade MariaDB to 10.1.28
 
 ## [0.2.6] - 16-08-2017
 ### Update
@@ -26,11 +31,11 @@
 ## [0.2.3] - 15-07-2017
 ### Update
 - Upgrade Craft to 2.6.2987
-- Upgrade MariaDB to 10.2.27
+- Upgrade MariaDB to 10.1.27
 
 ## [0.2.2] - 11-07-2017
 ### Update
-- Upgrade MariaDB to 10.2.26
+- Upgrade MariaDB to 10.1.26
 
 ## [0.2.1] - 30-06-2017
 ### Update
diff --git a/Dockerfile b/Dockerfile
index 436b89b..da908ca 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@ FROM wyveo/nginx-php-fpm:latest
 MAINTAINER Colin Wilson "colin@wyveo.com"
 
 # Set craft cms version
-ENV CRAFT_VERSION=2.6 CRAFT_BUILD=2990
+ENV CRAFT_VERSION=2.6 CRAFT_BUILD=2993
 
 ENV CRAFT_ZIP=Craft-$CRAFT_VERSION.$CRAFT_BUILD.zip
 
diff --git a/README.md b/README.md
index 13efbf3..4e8fad6 100644
--- a/README.md
+++ b/README.md
@@ -4,8 +4,8 @@ This is a  [Craft CMS](https://craftcms.com/) / [Craft 3 Beta](https://craftcms.
 #### Versioning
 | Docker Tag | Git Branch | Craft Release | Database | Caching |
 |-----|-------|-----|--------|--------|
-| latest | master | 2.6.2990 | MariaDB 10.2.8 | Redis 3.2.11 |
-| craft3beta | craft3beta | 3.0.0-beta.28 | PostgreSQL 9.6.5 | Memcached 1.5.1 |
+| latest | master | 2.6.2993 | MariaDB 10.2.9 | Redis 3.2.11 |
+| craft3beta | craft3beta | 3.0.0-beta.29 | PostgreSQL 10.0 | Memcached 1.5.2 |
 
 Features:
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 6f9eb28..32290c8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -23,7 +23,7 @@ web:
     DB_PASS: secret
 
 mariadb:
-  image: mariadb:10.2.8
+  image: mariadb:10.2.9
   environment:
     MYSQL_ROOT_PASSWORD: root
     MYSQL_USER: craft