2
0
Mark Shust 6 жил өмнө
parent
commit
44da45d6c4

+ 6 - 0
CHANGELOG.md

@@ -8,6 +8,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 - N/A
 
+## [21.1.2] - 2018-02-04
+
+### Fixed
+- Helper script `bin/fixowns` now fixes permissions on `/var/www` instead of `/var/www/html` folder.
+- Removed superfluous mounting of `~/.composer` directory in `docker-compose.dev.yml` file.
+
 ## [21.1.1] - 2018-12-27
 
 ### Fixed

+ 3 - 1
README.md

@@ -158,7 +158,9 @@ The hostname of each service is the name of the service within the `docker-compo
 
 First setup Magento Marketplace authentication (details in the [DevDocs](http://devdocs.magento.com/guides/v2.0/install-gde/prereq/connect-auth.html)).
 
-After doing so, copy the auth sample file to:
+After doing so, copy `src/auth.json.sample` to `~/.composer/auth.json`. Then update the username and password values with your Magento public and private keys, respectively. The entire `~/.composer` directory is remotely mounted to the container, so Composer will automatically see your keys to authenticate.
+
+The other option is copy `src/auth.json.sample` to `src/auth.json`. Then, update your 
 
 - `cp src/auth.json.sample src/auth.json`
 

+ 1 - 1
compose/magento-2/bin/fixowns

@@ -1,3 +1,3 @@
 #!/bin/bash
 echo "Correcting filesystem ownerships..."
-bin/rootnotty chown -R app:app /var/www/html
+bin/rootnotty chown -R app:app /var/www/

+ 2 - 2
compose/magento-2/docker-compose.dev.yml

@@ -1,5 +1,5 @@
 # Mark Shust's Docker Configuration for Magento (https://github.com/markshust/docker-magento)
-# Version 21.1.1
+# Version 21.1.2
 
 version: "3"
 
@@ -7,7 +7,7 @@ services:
   app:
     volumes: &appvolumes
       # Host mounts with performance penalty, only put what is necessary here
-      - ~/.composer:/var/www/.composer:delegated
+      #- ./src/auth.json:/var/www/html/auth.json:delegated
       - ./src/app/code:/var/www/html/app/code:delegated
       - ./src/app/design:/var/www/html/app/design:delegated
       - ./src/app/etc:/var/www/html/app/etc:delegated

+ 1 - 1
compose/magento-2/docker-compose.yml

@@ -1,5 +1,5 @@
 # Mark Shust's Docker Configuration for Magento (https://github.com/markshust/docker-magento)
-# Version 21.1.1
+# Version 21.1.2
 
 version: "3"