Merge branch 'master' into patch-3

This commit is contained in:
cytopia 2020-03-06 17:01:32 +01:00 committed by GitHub
commit a98c6146a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 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

@ -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