Upgrade Craft to 2.6.3016

Author: colinwilson

CHANGELOG.md

@@ -1,3 +1,7 @@
+## [0.3.5] - 16-05-2018
+### Update
+- Upgrade Craft to [2.6.3016](https://github.com/craftcms/cms/blob/develop/CHANGELOG-v2.md)
+
 ## [0.3.4] - 28-04-2018
 ### Update
 - Updates to reflect branch renaming

Dockerfile

@@ -3,7 +3,7 @@ FROM wyveo/nginx-php-fpm:php71
 MAINTAINER Colin Wilson "colin@wyveo.com"
 
 # Set craft cms version
-ENV CRAFT_VERSION=2.6 CRAFT_BUILD=3015
+ENV CRAFT_VERSION=2.6 CRAFT_BUILD=3016
 
 ENV CRAFT_ZIP=Craft-$CRAFT_VERSION.$CRAFT_BUILD.zip
 

README.md

@@ -1,11 +1,11 @@
 [![Docker Hub; wyveo/craftcms-docker](https://img.shields.io/badge/docker%20hub-%20wyveo%2Fcraftcms--docker-blue.svg)](https://hub.docker.com/r/wyveo/craftcms-docker/) ![License MIT](https://img.shields.io/badge/license-MIT-blue.svg)
 ## Introduction
-This is a  [Craft 3](https://craftcms.com/3) / [Craft CMS](https://craftcms.com/) base running on the [nginx-php-fpm](https://hub.docker.com/r/wyveo/nginx-php-fpm/) docker image.
+This is a  [Craft 3](https://craftcms.com/3) / [Craft 2](https://craftcms.com/) base running on the [nginx-php-fpm](https://hub.docker.com/r/wyveo/nginx-php-fpm/) docker image.
 #### Versioning
 | Docker Tag | Git Branch | Craft Release | Database | Caching |
 |-----|-------|-----|--------|--------|
-| latest | craft3 | 3.0.4 | PostgreSQL 10.3 | Redis 4.0.9 |
-| craft2 | craft2 | 2.6.3015 | MariaDB 10.3.6 | Redis 4.0.9 |
+| latest | craft3 | 3.0.8 | PostgreSQL 10.4 | Redis 4.0.9 |
+| craft2 | craft2 | 2.6.3016 | MariaDB 10.3.6 | Redis 4.0.9 |
 
 Features:
 

docker-compose.yml

@@ -1,39 +1,48 @@
-web:
-  image: wyveo/craftcms-docker:craft2
-  ports:
-    - 80:80
-  volumes:
-    - /var/log
-  links:
-    - mariadb
-    - redis
-  # env vars are replaced in /craft/config
-  environment:
-    # Set locale to UTF-8 (https://oncletom.io/2015/docker-encoding/)
-    LANG: C.UTF-8
+version: '2'
 
-    # REDIS is linked
-    REDIS_HOST: redis
+volumes:
+  craftcms-data:
+  mariadb-data:
+  craftcms-logs:
 
-    # DB is linked
-    DB_HOST: mariadb
-    DB_NAME: craft
-    DB_PORT: 3306
-    DB_USER: craft
-    DB_PASS: secret
+services:
+  web:
+    image: wyveo/craftcms-docker:craft2
+    ports:
+      - 80:80
+    volumes:
+      - craftcms-logs:/var/log
+      - craftcms-data:/usr/share/nginx
+    links:
+      - mariadb
+      - redis
+    # env vars are replaced in /craft/config
+    environment:
+      # Set locale to UTF-8 (https://oncletom.io/2015/docker-encoding/)
+      LANG: C.UTF-8
 
-mariadb:
-  image: mariadb:10.3.6
-  environment:
-    MYSQL_ROOT_PASSWORD: root
-    MYSQL_USER: craft
-    MYSQL_PASSWORD: secret
-    MYSQL_DATABASE: craft
-  volumes:
-    # Persistent data
-    - /var/lib/mysql
+      # REDIS is linked
+      REDIS_HOST: redis
 
-redis:
-  image: redis:4.0.9-alpine
-  volumes:
-    - /data:/data
+      # DB is linked
+      DB_HOST: mariadb
+      DB_NAME: craft
+      DB_PORT: 3306
+      DB_USER: craft
+      DB_PASS: secret
+
+  mariadb:
+    image: mariadb:10.3.6
+    environment:
+      MYSQL_ROOT_PASSWORD: root
+      MYSQL_USER: craft
+      MYSQL_PASSWORD: secret
+      MYSQL_DATABASE: craft
+    volumes:
+      # Persistent data
+      - mariadb-data:/var/lib/mysql/data
+
+  redis:
+    image: redis:4.0.9-alpine
+    volumes:
+      - /data:/data