Skip to content

Commit

Permalink
Upgrade Craft to 2.6.2993 & MariaDB
Browse files Browse the repository at this point in the history
  • Loading branch information
colinwilson committed Oct 20, 2017
1 parent b40636a commit fe2d62e
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 7 deletions.
11 changes: 8 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM wyveo/nginx-php-fpm:latest
MAINTAINER Colin Wilson "[email protected]"

# 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

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit fe2d62e

Please sign in to comment.