Merge branch 'release/2.4.25' into craft-webpack

CHANGELOG.md

@@ -1,5 +1,15 @@
 # nystudio107/craft Change Log
 
+## 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
+
+### 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`

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"

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",

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)

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)
@@ -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 \