Merge branch 'master' into docs/expressionengine

This commit is contained in:
Andy Mc 2020-03-19 12:44:20 -04:00 committed by GitHub
commit 80b6582d91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 7 deletions

View File

@ -4,7 +4,7 @@
**Abstract**
The Devilbox is currently being developed in my spare time and mostly reflects the features that I
am using for all the web projcets I have to handle. In order to better present it to the majority
am using for all the web projects I have to handle. In order to better present it to the majority
of other software developers I do require support to cope with all the feature requests.

View File

@ -390,7 +390,7 @@ host operating systems ``/etc/hosts`` file (or ``C:\Windows\System32\drivers\etc
.. code-block:: bash
:caption: /etc/hosts
127.0.0.1 my-node.loc
127.0.0.1 my-sphinx.loc
.. seealso::

View File

@ -38,7 +38,7 @@ Let's imagine you have added a custom Python Docker image to the Devilbox which
application listening on port ``3000``.
* :ref:`env_TLD_SUFFIX`: ``loc``
* Desired DNS name: ``my-pthon.loc``
* Desired DNS name: ``my-python.loc``
* :ref:`env_httpd_datadir` on the host: ``./data/www``
* :ref:`env_httpd_template_dir`: ``.devilbox``
* Listening port: ``3000``

View File

@ -299,7 +299,7 @@ MYSQL_SERVER=mariadb-10.3
###
### 1.4 Choose PostgreSQL Server Image
###
### IMPORTANT: Apline based images might cause issues on Docker Toolbox or OSX
### IMPORTANT: Alpine based images might cause issues on Docker Toolbox or OSX
### https://github.com/docker/toolbox/issues/510
###
#PGSQL_SERVER=9.0
@ -361,7 +361,7 @@ PGSQL_SERVER=12.1
###
### 1.5 Choose Redis Server Image
###
### IMPORTANT: Apline based images might cause issues on Docker Toolbox or OSX
### IMPORTANT: Alpine based images might cause issues on Docker Toolbox or OSX
### https://github.com/docker/toolbox/issues/510
###
#REDIS_SERVER=2.8
@ -380,7 +380,7 @@ REDIS_SERVER=5.0
###
### 1.6 Choose Memcached Server Image
###
### IMPORTANT: Apline based images might cause issues on Docker Toolbox or OSX
### IMPORTANT: Alpine based images might cause issues on Docker Toolbox or OSX
### https://github.com/docker/toolbox/issues/510
###
#MEMCD_SERVER=1.4
@ -419,7 +419,7 @@ MONGO_SERVER=4.2
### existing mount options.
###
### Note: If no mount options are specified, leave this variable empty
### and do not add a leading ',' (comman).
### and do not add a leading ',' (comma).
###
### MOUNT_OPTIONS=,cached
### MOUNT_OPTIONS=