Update Craft 3 to 3.1.3; Update Redis to 5.0.3; Use PHP 7.3

wyveo · Jan 24, 2019 · 4a1ab99 · 4a1ab99
1 parent 2713f44
commit 4a1ab99
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## [0.2.6] - 24-01-2019
+### Update
+- Use Wyveo PHP-FPM 7.3 image [wyveo/nginx-php-fpm:php73](https://github.com/wyveo/nginx-php-fpm/tree/php73)
+- Update Craft to [3.1.3](https://github.com/craftcms/cms/blob/develop/CHANGELOG-v3.md)
+- Upgrade Redis to [5.0.3](https://raw.githubusercontent.com/antirez/redis/5.0/00-RELEASENOTES)
+
 ## [0.2.5] - 30-11-2018
 ### Update
 - Update Craft to [3.0.33](https://github.com/craftcms/cms/blob/develop/CHANGELOG-v3.md)

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM wyveo/nginx-php-fpm:php72
+FROM wyveo/nginx-php-fpm:php73
 
 MAINTAINER Colin Wilson "[email protected]"
 

diff --git a/LICENSE b/LICENSE
@@ -1,5 +1,5 @@
 
-Copyright (c) 2017 - 2018 wyveo.com
+Copyright (c) 2017 - 2019 wyveo.com
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

diff --git a/README.md b/README.md
@@ -1,20 +1,20 @@
-[![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)
+[![Docker Hub; wyveo/craftcms-docker](https://img.shields.io/badge/docker%20hub-wyveo%2Fcraftcms--docker-blue.svg?&logo=docker&style=for-the-badge)](https://hub.docker.com/r/wyveo/craftcms-docker/) [![License MIT](https://img.shields.io/badge/license-MIT-blue.svg?&style=for-the-badge)](https://github.com/wyveo/nginx-php-fpm/blob/master/LICENSE)
 ## Introduction
 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.33 | PostgreSQL 10.6 | Redis 4.0.11 |
-| craft2 | craft2 | 2.7.3 | MariaDB 10.3.10 | Redis 4.0.11 |
+| latest | craft3 | 3.1.3 | PostgreSQL 10.6 | Redis 5.0.3 |
+| craft2 | craft2 | 2.7.4 | MariaDB 10.4.1 | Redis 4.0.12 |
 
 Features:
 
- - Nginx 1.15.x, PHP-FPM 7.2.x, Git 2.11.0
+ - Nginx 1.15.x, PHP-FPM 7.3.x, Git 2.11.0
  - imageMagick image manipulation library
 
 ## Clone repo and run
 To run, clone the git repo and run `docker-compose up`:
-#### Craft 3 - [![version craft3](https://img.shields.io/badge/version-craft3-blue.svg)](https://craftcms.com/3) [![](https://images.microbadger.com/badges/image/wyveo/craftcms-docker:craft3.svg)](https://microbadger.com/images/wyveo/craftcms-docker:craft3 "Get your own image badge on microbadger.com")
+#### Craft 3 - [![version craft3](https://img.shields.io/badge/version-Craft%203-red.svg?&style=for-the-badge)](https://craftcms.com/3) [![](https://img.shields.io/microbadger/image-size/wyveo/craftcms-docker/craft3.svg?&style=for-the-badge)](https://microbadger.com/images/wyveo/craftcms-docker) [![](https://img.shields.io/microbadger/layers/wyveo/craftcms-docker/craft3.svg?&style=for-the-badge)](https://microbadger.com/images/wyveo/craftcms-docker)
 ```
 $ git clone https://github.com/wyveo/craftcms-docker.git
 $ cd craftcms-docker
@@ -23,7 +23,7 @@ $ sudo docker-compose up -d
 navigate to `http://<HOSTNAME>/index.php?p=admin` to begin installing Craft 3.
 NOTE: if the above url doesn't work, try navigating to `http://<HOSTNAME>/admin/install` instead.
 
-#### Craft 2 - [![version craft2](https://img.shields.io/badge/version-craft2-blue.svg)](https://craftcms.com) [![](https://images.microbadger.com/badges/image/wyveo/craftcms-docker:craft2.svg)](https://microbadger.com/images/wyveo/craftcms-docker:craft2 "Get your own image badge on microbadger.com")
+#### Craft 2 - [![version craft2](https://img.shields.io/badge/version-Craft%202-red.svg?&style=for-the-badge)](https://craftcms.com/2) [![](https://img.shields.io/microbadger/image-size/wyveo/craftcms-docker/craft2.svg?&style=for-the-badge)](https://microbadger.com/images/wyveo/craftcms-docker) [![](https://img.shields.io/microbadger/layers/wyveo/craftcms-docker/craft2.svg?&style=for-the-badge)](https://microbadger.com/images/wyveo/craftcms-docker)
 ```
 $ git clone -b craft2 --single-branch https://github.com/wyveo/craftcms-docker.git
 $ cd craftcms-docker

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -47,6 +47,6 @@ services:
  - postgresql-data:/var/lib/postgresql/data
 
  redis:
- image: redis:4.0.11-alpine
+ image: redis:5.0.3-alpine
  volumes:
  - /data:/data