Merge branch 'release/2.2.4' into craft-webpack

nystudio107 · Mar 27, 2020 · 051646f · 051646f
2 parents e2e37e1 + e7fcaf3
commit 051646f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # nystudio107/craft Change Log
 
+## 2.2.4 - 2020.03.27
+### Changed
+* Skip a superfluous copy operation in the Nginx container
+
 ## 2.2.3 - 2020.03.21
 ### Changed
 * Added `SERVERLESS_SHARP_CLOUDFRONT_URL` to the `example.env`

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "craftcms/craft",
   "description": "nystudio107 Craft 3.4 CMS scaffolding project",
-  "version": "2.2.1",
+  "version": "2.2.4",
   "keywords": [
     "craft",
     "cms",

diff --git a/docker-config/nginx/Dockerfile b/docker-config/nginx/Dockerfile
@@ -1,4 +1,3 @@
 FROM nginx:1.16
 
 COPY ./docker-config/nginx/default.conf /etc/nginx/conf.d/default.conf
-COPY --chown=www-data:www-data ./cms/web /var/www/project/cms/web