فهرست منبع

Added project-specific auth.json file to dev/ folder

Mark Shust 6 سال پیش
والد
کامیت
4843a377ab

+ 6 - 1
README.md

@@ -174,7 +174,7 @@ Open up `src/pub/index.php`, and set a breakpoint near the end of the file. Go t
 
 Please first setup Magento Marketplace authentication (details in the [DevDocs](http://devdocs.magento.com/guides/v2.0/install-gde/prereq/connect-auth.html)).
 
-Place your auth token at `~/.composer/auth.json` with the following contents, like so:
+Update the auth credentials within `./dev/auth.json`, replacing your public and private key respectively:
 
 ```
 {
@@ -186,3 +186,8 @@ Place your auth token at `~/.composer/auth.json` with the following contents, li
     }
 }
 ```
+
+If you wish to use your system's `auth.json` file, you can also setup a symlink from your Composer home directory like so:
+
+    ln -s ~/.composer/auth.json dev/auth.json
+

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

@@ -1,5 +1,5 @@
 # Mark Shust's Docker Configuration for Magento (https://github.com/markoshust/docker-magento)
-# Version 13.0.2
+# Version 14.0.0
 
 version: "3"
 
@@ -14,6 +14,7 @@ services:
     volumes: &appvolumes
       - ./src:/var/www/html:delegated
       - ~/.composer:/var/www/.composer:delegated
+      - ./dev/auth.json:/var/www/.composer/auth.json
       - sockdata:/sock
 
   phpfpm:

+ 8 - 0
compose/magento-2-windows/dev/auth.json

@@ -0,0 +1,8 @@
+{
+    "http-basic": {
+        "repo.magento.com": {
+            "username": "MAGENTO_PUBLIC_KEY",
+            "password": "MAGENTO_PRIVATE_KEY"
+        }
+    }
+}

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

@@ -1,5 +1,5 @@
 # Mark Shust's Docker Configuration for Magento (https://github.com/markoshust/docker-magento)
-# Version 13.0.2
+# Version 14.0.0
 
 version: "3"
 
@@ -16,6 +16,8 @@ services:
       - ./src/app:/var/www/html/app:delegated
       - ~/.composer:/var/www/html/var/composer_home:delegated
       - ~/.composer:/var/www/.composer:delegated
+      - ./dev/auth.json:/var/www/html/var/composer_home/auth.json
+      - ./dev/auth.json:/var/www/.composer/auth.json
       - sockdata:/sock
 
   phpfpm:

+ 8 - 0
compose/magento-2/dev/auth.json

@@ -0,0 +1,8 @@
+{
+    "http-basic": {
+        "repo.magento.com": {
+            "username": "MAGENTO_PUBLIC_KEY",
+            "password": "MAGENTO_PRIVATE_KEY"
+        }
+    }
+}

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

@@ -1,5 +1,5 @@
 # Mark Shust's Docker Configuration for Magento (https://github.com/markoshust/docker-magento)
-# Version 13.0.2
+# Version 14.0.0
 
 version: "3"
 
@@ -15,6 +15,8 @@ services:
       - ./src:/var/www/html:delegated
       - ~/.composer:/var/www/html/var/composer_home:delegated
       - ~/.composer:/var/www/.composer:delegated
+      - ./dev/auth.json:/var/www/html/var/composer_home/auth.json
+      - ./dev/auth.json:/var/www/.composer/auth.json
       - sockdata:/sock
 
   phpfpm: