From e5913e50ee891b743669b7c8b30c1530ba8a3977 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Wed, 19 Jul 2017 13:47:45 +0200
Subject: [PATCH] Update readme
---
README.md | 33 +++++++++++++++++++--------------
1 file changed, 19 insertions(+), 14 deletions(-)
diff --git a/README.md b/README.md
index 3388952..412b510 100644
--- a/README.md
+++ b/README.md
@@ -119,17 +119,7 @@ There are potentially more options possible, for details please refer to the Dru
#### Configure SSH access from the PHP container
-If you SSH access to the remote host is protected by a public/private key pair, then you have to configure you Docker container to be able to access the remote host. Here are the steps you need to take:
-
-```bash
-docker-compose exec php sh
-ssh-keygen -t rsa -b 4096 -C "your_email@example.com"
-# For all the following questions just hit enter
-cat /root/.ssh/id_rsa.pub
-```
-
-This will show you the just created public key on the console and you should copy that output and then once go to your remote host and add that key to the end of the file `~/.ssh/authorized_keys`.
-
+Your host SSH configuration is automatically forwarded to the PHP docker container using sockets and you don't have to do anything to make it work, as long as your host is configured correctly to access your live site via SSH - in this case the PHP container can too.
### Using Drush
@@ -184,8 +174,9 @@ To overwrite the default settings for the Docker environment, add the relevant p
"version": "7.0",
"xdebug": 1
},
- "nginx": {
- "version": "1.10"
+ "webserver": {
+ "type": "nginx",
+ "version": "1.13"
},
"varnish": {
"enable": 0
@@ -194,7 +185,19 @@ To overwrite the default settings for the Docker environment, add the relevant p
"enable": 0
},
"node": {
+ "enable": 0,
+ "key": "",
+ "path": ""
+ },
+ "memcached": {
+ "enable": 0
+ },
+ "rsyslog": {
"enable": 0
+ },
+ "athenapdf": {
+ "enable": 0,
+ "key": ""
}
}
}
@@ -203,7 +206,9 @@ To overwrite the default settings for the Docker environment, add the relevant p
Other supported values for the PHP version are `5.3`, `5.6` and `7.1`.
-Once you've changed those values, run `composer update` and the environment will be re-configured. THe next time you start your Docker environment those new values will be used.
+Other supported value for the webserver type is `apache`.
+
+Once you've changed those values, run `composer update` and the environment will be re-configured. The next time you start your Docker environment those new values will be used.
## Tipps & Tricks
--
GitLab