From eeabe8e286628340847f5b40d4609ea44ce366ca Mon Sep 17 00:00:00 2001 From: Colin Wilson Date: Tue, 5 Nov 2019 13:26:42 +0000 Subject: [PATCH] Update Craft to 3.3.14; PostgreSQL to 11.5; Redis to 5.0.6 --- CHANGELOG.md | 6 ++++++ Dockerfile | 2 +- README.md | 4 ++-- docker-compose.yml | 4 ++-- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6318740..2784008 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## [0.3.6] - 05-11-2019 +### Update +- Update Craft to [3.3.14](https://github.com/craftcms/cms/blob/develop/CHANGELOG-v3.md) +- Upgrade Redis to [5.0.6](https://raw.githubusercontent.com/antirez/redis/5.0/00-RELEASENOTES) +- Update PostgreSQL to [11.5](https://www.postgresql.org/docs/11/release-11-5.html) + ## [0.3.5] - 19-04-2019 ### Update - Update PHP `max_execution_time` to 120s diff --git a/Dockerfile b/Dockerfile index 694d73d..781b3c8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ sed -i -e "s/;session.save_path\s*=\s*.*/session.save_path = \"\${REDIS_PORT_637 wget -q -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - && \ sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ `lsb_release -cs`-pgdg main" >> /etc/apt/sources.list.d/pgdg.list' && \ apt-get update && \ -apt-get install -y postgresql-client-10 +apt-get install -y postgresql-client-11 # Create Craft project RUN composer create-project craftcms/craft /usr/share/nginx/ diff --git a/README.md b/README.md index 63a0787..ce569a7 100644 --- a/README.md +++ b/README.md @@ -4,12 +4,12 @@ This is a [Craft 3](https://craftcms.com/3) / [Craft 2](https://craftcms.com/) #### Versioning | Docker Tag | Git Branch | Craft Release | Database | Caching | |-----|-------|-----|--------|--------| -| latest | craft3 | 3.1.23 | PostgreSQL 10.7 | Redis 5.0.4 | +| latest | craft3 | 3.3.14 | PostgreSQL 11.5 | Redis 5.0.6 | | craft2 | craft2 | 2.7.5 | MariaDB 10.4.3 | Redis 4.0.13 | Features: - - Nginx 1.15.x, PHP-FPM 7.3.x, Git 2.11.0 + - Nginx 1.17.x, PHP-FPM 7.3.x, Git 2.11.0 - imageMagick image manipulation library ## Clone repo and run diff --git a/docker-compose.yml b/docker-compose.yml index 7943bc8..b3b55e2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -37,7 +37,7 @@ services: LANG: C.UTF-8 postgres: - image: postgres:10.7 + image: postgres:11.5 environment: POSTGRES_USER: craft3 POSTGRES_PASSWORD: secret @@ -48,6 +48,6 @@ services: - postgresql-data:/var/lib/postgresql/data redis: - image: redis:5.0.4-alpine + image: redis:5.0.6-alpine volumes: - /data:/data