diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c19bc4..e89a1b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## [0.3.1] - 03-11-2017 +### Update +- Upgrade Craft to 2.6.2994 +- Upgrade MariaDB to 10.2.10 + ## [0.3.0] - 20-10-2017 ### Update - Upgrade Craft to 2.6.2993 diff --git a/Dockerfile b/Dockerfile index da908ca..275c55e 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=2993 +ENV CRAFT_VERSION=2.6 CRAFT_BUILD=2994 ENV CRAFT_ZIP=Craft-$CRAFT_VERSION.$CRAFT_BUILD.zip diff --git a/README.md b/README.md index 4e8fad6..448eb00 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.2993 | MariaDB 10.2.9 | Redis 3.2.11 | -| craft3beta | craft3beta | 3.0.0-beta.29 | PostgreSQL 10.0 | Memcached 1.5.2 | +| latest | master | 2.6.2994 | MariaDB 10.2.10 | Redis 3.2.11 | +| craft3beta | craft3beta | 3.0.0-beta.30 | PostgreSQL 10.0 | Memcached 1.5.2 | Features: diff --git a/docker-compose.yml b/docker-compose.yml index 32290c8..fe87b5c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -23,7 +23,7 @@ web: DB_PASS: secret mariadb: - image: mariadb:10.2.9 + image: mariadb:10.2.10 environment: MYSQL_ROOT_PASSWORD: root MYSQL_USER: craft