From 00c43bf8b7e94b2a0cc299049e3cbe00ab62f8a2 Mon Sep 17 00:00:00 2001 From: cytopia Date: Thu, 7 Dec 2017 08:41:33 +0100 Subject: [PATCH 1/7] DVL-013 Show Auto-DNS in documentation ToC --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 7fed3669..d383ba63 100644 --- a/README.md +++ b/README.md @@ -370,6 +370,8 @@ As far as tested there are no limitations and you can use any Framework or CMS j 4. [Container settings](docs/Configure.md#4-container-settings) 5. [Intranet settings](docs/Configure.md#5-intranet-settings) 6. [Host computer](docs/Configure.md#6-host-computer) + 1. [/etc/hosts](docs/Configure.md#61-etchosts) + 2. [Auto-DNS](docs/Configure.md#62-auto-dns) 6. **[Run](docs/Run.md)** 1. [Start the devilbox](docs/Run.md#1-start-the-devilbox) 2. [Stop the devilbox](docs/Run.md#2-stop-the-devilbox) @@ -414,7 +416,7 @@ As far as tested there are no limitations and you can use any Framework or CMS j 7. [Setup Wordpress](docs/Examples.md#27-setup-wordpress) 8. [Setup Yii](docs/Examples.md#28-setup-yii) 9. [Setup Zend](docs/Examples.md#29-setup-zend) - 3. [Code analysis](docs/Examples.md#3-code-analysis) + 3. [Code analysis](docs/Examples.md#3-code-analysis) 1. [awesome-ci](docs/Examples.md#31-awesome-ci) 2. [phpcs](docs/Examples.md#32-phpcs) 3. [eslint](docs/Examples.md#33-eslint) From 1f8390c8a6bcdf09f1a12095cd35dfaa9b5607ef Mon Sep 17 00:00:00 2001 From: cytopia Date: Thu, 7 Dec 2017 08:41:49 +0100 Subject: [PATCH 2/7] DVL-013 Bump date --- .devilbox/www/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devilbox/www/config.php b/.devilbox/www/config.php index eb683bab..ef099b0f 100644 --- a/.devilbox/www/config.php +++ b/.devilbox/www/config.php @@ -14,7 +14,7 @@ putenv('RES_OPTIONS=retrans:1 retry:1 timeout:1 attempts:1'); $DEVILBOX_VERSION = 'v0.12'; -$DEVILBOX_DATE = '2017-11-21'; +$DEVILBOX_DATE = '2017-12-07'; $DEVILBOX_API_PAGE = 'devilbox-api/status.json'; // From e0e37bb64d70fad60d8f91b2c035b637d309f97c Mon Sep 17 00:00:00 2001 From: cytopia Date: Thu, 7 Dec 2017 08:42:07 +0100 Subject: [PATCH 3/7] DVL-013 Adjust Pull Request template --- .github/PULL_REQUEST_TEMPLATE.md | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 7e91a5f4..45d6cbe3 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,5 +1,10 @@ -Fixes # . +# FEATURE_NAME -Changes proposed in this pull request: +#### Short description -- ... + + + +#### Tass done + +* [ ] Updated `$DEVILBOX_DATE` in [config.php](.devilbox/www/config.php) From 033ed60148bd0532d23c7d8af8d95362dfacaa45 Mon Sep 17 00:00:00 2001 From: cytopia Date: Thu, 7 Dec 2017 09:15:52 +0100 Subject: [PATCH 4/7] DVL-013 #163 Extend Auto-DNS documentation --- docs/Configure.md | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/docs/Configure.md b/docs/Configure.md index 0a44d056..fe056464 100644 --- a/docs/Configure.md +++ b/docs/Configure.md @@ -976,12 +976,20 @@ The devilbox provides its own DNS nameserver that automatically configures itsel You can make advantage of that by adding this DNS nameserver to your host computers DNS config in `/etc/resolv.conf`. Then everytime you make a request (in your Browser for example) to a devilbox project domain, the bundled DNS name server will successfully answer the request and direct you to the project. This will remove the need to make custom `/etc/hosts` entries for each project. + **What is required for this to work?** -First of all, you need to make sure that nothing on your host computer is listening on port 53. +By default, the Bind port (`.env`: `HOST_PORT_BIND=1053`) is set to a non standard DNS port in order to avoid failed devilbox startups in case you already have a local DNS resolver running. So edit your `.env` file and set the Bind port to `53`: +``` +$ vi .env + +HOST_PORT_BIND=53 +``` + +Then you need to make sure that nothing on your host computer is listening on port 53. Do this before starting up the devilbox. ```shell -$ netstat -tulpen | grep ':53' +$ netstat -tuln | grep ':53' ``` If there is already something listening on that port, you will need to stop whatever is listening in port 53 (TCP and UDP). From 38460eaa1aeab5fa2316ea924d3072c6c23b4b76 Mon Sep 17 00:00:00 2001 From: cytopia Date: Thu, 7 Dec 2017 09:32:09 +0100 Subject: [PATCH 5/7] DVL-013 Improve docs: work inside the container --- docs/Usage.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/Usage.md b/docs/Usage.md index 93ead322..e6cdc081 100644 --- a/docs/Usage.md +++ b/docs/Usage.md @@ -89,6 +89,14 @@ Here is an example to list the PHP inside the container from the Docker host. $ docker-compose exec --user devilbox php php -v ``` +However, instead of having to type all of the above for a simple command execution, you might be better off to simply enter the PHP container and work on a normal shell. Going into the container is as simple as this: + +``` +$ ./shell.sh +``` + +Read more about this in the next section. + ## 3. Work inside the PHP container From 3f5555ee199533b47dc032f397318c248d043e62 Mon Sep 17 00:00:00 2001 From: cytopia Date: Thu, 7 Dec 2017 09:34:04 +0100 Subject: [PATCH 6/7] DVL-013 Fix typo in PR template --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 45d6cbe3..35ecd434 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -5,6 +5,6 @@ -#### Tass done +#### Tasks done * [ ] Updated `$DEVILBOX_DATE` in [config.php](.devilbox/www/config.php) From d1bbd5d92b4fa3d912abaf6d8c9cf4a4a22c1d1e Mon Sep 17 00:00:00 2001 From: cytopia Date: Thu, 7 Dec 2017 09:35:43 +0100 Subject: [PATCH 7/7] DVL-013 Link Date statement in PR template --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 35ecd434..75085f54 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -7,4 +7,4 @@ #### Tasks done -* [ ] Updated `$DEVILBOX_DATE` in [config.php](.devilbox/www/config.php) +* [ ] Updated `$DEVILBOX_DATE` in [config.php](https://github.com/cytopia/devilbox/blob/master/.devilbox/www/config.php#L17)