Skip to content

Commit

Permalink
Merge pull request #869 from cytopia/release/v1.10.5
Browse files Browse the repository at this point in the history
Release/v1.10.5
  • Loading branch information
cytopia authored Mar 16, 2022
2 parents 31103f0 + 4b3cc3f commit 349fa0e
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .devilbox/www/config.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
putenv('RES_OPTIONS=retrans:1 retry:1 timeout:1 attempts:1');


$DEVILBOX_VERSION = 'v1.10.4';
$DEVILBOX_DATE = '2022-02-15';
$DEVILBOX_VERSION = 'v1.10.5';
$DEVILBOX_DATE = '2022-03-16';
$DEVILBOX_API_PAGE = 'devilbox-api/status.json';

//
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@ Make sure to have a look at [UPDATING.md](https://github.com/cytopia/devilbox/bl
## Unreleased


## Release v1.10.5 (2022-03-16)

#### Changed
- Updated Bind [#36](https://github.com/cytopia/docker-bind/pull/36)
- Updated MySQL


## Release v1.10.4 (2022-02-15)

#### Fixed
Expand Down
8 changes: 4 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ services:
# Bind (DNS Server)
# ------------------------------------------------------------
bind:
image: cytopia/bind:0.15
image: cytopia/bind:0.27
hostname: bind
restart: always
ports:
Expand All @@ -51,8 +51,7 @@ services:
##
## Bind wildcard/host settings
##
- WILDCARD_DNS=${TLD_SUFFIX:-loc}=127.0.0.1
- EXTRA_HOSTS=${EXTRA_HOSTS}
- DNS_A=*.${TLD_SUFFIX:-loc}=127.0.0.1,${EXTRA_HOSTS:-}

##
## Forwarding
Expand Down Expand Up @@ -320,7 +319,7 @@ services:
# MySQL Database
# ------------------------------------------------------------
mysql:
image: devilbox/mysql:${MYSQL_SERVER}-0.8
image: devilbox/mysql:${MYSQL_SERVER}-0.15
hostname: mysql

environment:
Expand Down Expand Up @@ -503,6 +502,7 @@ volumes:
devilbox-mariadb-10.5:
devilbox-mariadb-10.6:
devilbox-mariadb-10.7:
devilbox-mariadb-10.8:
devilbox-percona-5.5:
devilbox-percona-5.6:
devilbox-percona-5.7:
Expand Down

0 comments on commit 349fa0e

Please sign in to comment.