From 24c4c280fb947e83e91d809c1a9b797908b19b1d Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Thu, 4 Feb 2021 08:25:27 -0500 Subject: [PATCH 1/6] updated buddy.yaml to match with Alpine update --- buddy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buddy.yml b/buddy.yml index 27a19b1..e4f2e13 100644 --- a/buddy.yml +++ b/buddy.yml @@ -28,7 +28,7 @@ - "composer install --no-dev --no-progress --no-scripts --no-interaction --prefer-dist --optimize-autoloader --ignore-platform-reqs" setup_commands: - "echo \"memory_limit=-1\" >> /usr/local/etc/php/conf.d/buddy.ini" - - "apt-get update && apt-get install -y git zip" + - "apk update && apk add git zip" - "curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer" - "# php ext pdo_mysql" - "docker-php-ext-install pdo_pgsql pgsql" From 34dcc598bceaba8c341b6fca1259c68740216740 Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Thu, 4 Feb 2021 08:26:34 -0500 Subject: [PATCH 2/6] Version 2.4.25 --- CHANGELOG.md | 4 ++++ composer.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 47c614f..2b940e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # nystudio107/craft Change Log +## 2.4.25 - UNRELEASED +### Fixed +* Updated `buddy.yaml` to match with Alpine update + ## 2.4.24 - 2021.02.03 ### Fixed * Fixed an issue with favicon generation caused by changes in `favicons-webpack-plugin` diff --git a/composer.json b/composer.json index dbc4ca3..509eb83 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "craftcms/craft", "description": "nystudio107 Craft 3.4 CMS scaffolding project", - "version": "2.4.24", + "version": "2.4.25", "keywords": [ "craft", "cms", From a21d74cac558161c510f98edc87c09b14d536638 Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Thu, 4 Feb 2021 23:11:40 -0500 Subject: [PATCH 3/6] Ensure that the `cms/config` directory has the right permissions Signed-off-by: Andrew Welch --- docker-config/php-prod-craft/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docker-config/php-prod-craft/Dockerfile b/docker-config/php-prod-craft/Dockerfile index bdec430..081c92f 100755 --- a/docker-config/php-prod-craft/Dockerfile +++ b/docker-config/php-prod-craft/Dockerfile @@ -73,10 +73,12 @@ WORKDIR /var/www/project/cms # when working with teams or multiple environments CMD composer install --verbose --no-progress --no-scripts --optimize-autoloader --no-interaction \ && \ - chown -R www-data:www-data /var/www/project/cms/vendor \ + chown -R www-data:www-data /var/www/project/cms/config \ && \ chown -R www-data:www-data /var/www/project/cms/storage \ && \ + chown -R www-data:www-data /var/www/project/cms/vendor \ + && \ chown -R www-data:www-data /var/www/project/cms/web \ && \ composer craft-update \ From b19389ec3ad09d0f5a65d10c0f4731400cba3450 Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Thu, 4 Feb 2021 23:11:52 -0500 Subject: [PATCH 4/6] Version 2.4.25 Signed-off-by: Andrew Welch --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b940e1..ce77c29 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ # nystudio107/craft Change Log ## 2.4.25 - UNRELEASED +### Changed +* Ensure that the `cms/config` directory has the right permissions + ### Fixed * Updated `buddy.yaml` to match with Alpine update From 46490275a5950586fc2aac35e2002bd1b2a91295 Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Tue, 9 Feb 2021 20:31:52 -0500 Subject: [PATCH 5/6] Version 2.4.25 Signed-off-by: Andrew Welch --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ce77c29..05e7e21 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ # nystudio107/craft Change Log -## 2.4.25 - UNRELEASED +## 2.4.25 - 2021.02.09 +### Added +* Use PHP 8.0 Alpine images for the prod & dev containers + ### Changed * Ensure that the `cms/config` directory has the right permissions From accf70fb9a246e48d540bc936fcabb7a15c4ba95 Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Tue, 9 Feb 2021 20:32:21 -0500 Subject: [PATCH 6/6] Use PHP 8.0 Alpine images for the prod & dev containers Signed-off-by: Andrew Welch --- docker-config/php-dev-craft/Dockerfile | 2 +- docker-config/php-prod-craft/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-config/php-dev-craft/Dockerfile b/docker-config/php-dev-craft/Dockerfile index 9f1f64f..d4efb7a 100755 --- a/docker-config/php-dev-craft/Dockerfile +++ b/docker-config/php-dev-craft/Dockerfile @@ -1,4 +1,4 @@ -FROM nystudio107/php-dev-base:7.4-alpine +FROM nystudio107/php-dev-base:8.0-alpine # dependencies required for running "phpize" # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed) diff --git a/docker-config/php-prod-craft/Dockerfile b/docker-config/php-prod-craft/Dockerfile index 081c92f..4739338 100755 --- a/docker-config/php-prod-craft/Dockerfile +++ b/docker-config/php-prod-craft/Dockerfile @@ -1,4 +1,4 @@ -FROM nystudio107/php-prod-base:7.4-alpine +FROM nystudio107/php-prod-base:8.0-alpine # dependencies required for running "phpize" # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)