Merge pull request #647 from cytopia/release/v1.2.0

Release v1.2.0
cytopia · Dec 1, 2019 · bdf8eb7 · bdf8eb7
2 parents 44b146b + dc9a30e
commit bdf8eb7
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 14 deletions.
diff --git a/.devilbox/www/config.php b/.devilbox/www/config.php
@@ -13,8 +13,8 @@
 putenv('RES_OPTIONS=retrans:1 retry:1 timeout:1 attempts:1');
 
 
-$DEVILBOX_VERSION = 'v1.1.0';
-$DEVILBOX_DATE = '2019-11-24';
+$DEVILBOX_VERSION = 'v1.2.0';
+$DEVILBOX_DATE = '2019-12-01';
 $DEVILBOX_API_PAGE = 'devilbox-api/status.json';
 
 //

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,10 +4,25 @@ Make sure to have a look at [UPDATING](https://github.com/cytopia/devilbox/blob/
 major versions.
 
 
-
 ## Unreleased
 
 
+## Release v1.2.0 (2019-12-01)
+
+#### Fixed
+- [#622](https://github.com/cytopia/devilbox/issues/622) Certificate Generation Settings
+- [#640](https://github.com/cytopia/devilbox/issues/640) Mac OS Catalina invalidates virtual host certificates
+- [#592](https://github.com/cytopia/devilbox/issues/592) sqlsrv connection problem
+
+#### Added
+- Added latest PHP-FPM images
+- Added latest MySQL images
+- Added latest Apache/Nginx images
+
+#### Changed
+- Made PHP 7.3 the default version
+
+
 ## Release v1.1.0 (2019-11-24)
 
 #### Fixed

diff --git a/UPDATING.md b/UPDATING.md
@@ -3,6 +3,18 @@
 This document will hold all information on how to update between major versions.
 
 
+## Update from `v1.1.0` to `v1.2.0`
+
+**PR:** https://github.com/cytopia/devilbox/pull/647
+
+This release changes the way the SSL CA and certificates are generated.
+Background here: https://support.apple.com/en-us/HT210176
+
+In order to use the new CA, you will need to delete your current CA in `ca/devilbox-ca.*`.
+A new one will be automatically generated if none is present. Additionally you will have to
+import the CA again in your browser(s).
+
+
 ## Update from `v0.x.y` to `v1.x.y`
 
 #### Docker Volumes

diff --git a/cfg/php-startup-7.1/02-ms-odbc-driver.sh-example b/cfg/php-startup-7.1/02-ms-odbc-driver.sh-example
@@ -26,7 +26,7 @@ ACCEPT_EULA=N
 ###
 ### Where to retrieve the deb package
 ###
-MSODBC_URL="https://packages.microsoft.com/debian/8/prod/pool/main/m/msodbcsql17/"
+MSODBC_URL="https://packages.microsoft.com/debian/9/prod/pool/main/m/msodbcsql17/"
 
 
 ###

diff --git a/cfg/php-startup-7.2/02-ms-odbc-driver.sh-example b/cfg/php-startup-7.2/02-ms-odbc-driver.sh-example
@@ -26,7 +26,7 @@ ACCEPT_EULA=N
 ###
 ### Where to retrieve the deb package
 ###
-MSODBC_URL="https://packages.microsoft.com/debian/8/prod/pool/main/m/msodbcsql17/"
+MSODBC_URL="https://packages.microsoft.com/debian/9/prod/pool/main/m/msodbcsql17/"
 
 
 ###

diff --git a/cfg/php-startup-7.3/02-ms-odbc-driver.sh-example b/cfg/php-startup-7.3/02-ms-odbc-driver.sh-example
@@ -26,7 +26,7 @@ ACCEPT_EULA=N
 ###
 ### Where to retrieve the deb package
 ###
-MSODBC_URL="https://packages.microsoft.com/debian/8/prod/pool/main/m/msodbcsql17/"
+MSODBC_URL="https://packages.microsoft.com/debian/9/prod/pool/main/m/msodbcsql17/"
 
 
 ###

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,3 +1,4 @@
+---
 ##
 ## -------------------------
 ## |  D E V I L S T A C K  |
@@ -6,8 +7,8 @@
 ## Local LAMP/LEMP stack
 ##
 ##
-## ${VARIABLE:-default} will evaluate to default if VARIABLE is unset or empty in the environment.
-## ${VARIABLE-default}  will evaluate to default only if VARIABLE is unset in the environment.
+## ${VARIABLE:-default} will evaluate to default if VARIABLE is unset or empty.
+## ${VARIABLE-default}  will evaluate to default only if VARIABLE is unset.
 ##
 ##
 ## -- DO NOT EDIT THIS FILE --
@@ -21,7 +22,6 @@
 ##   $ cp env-example .env
 ##
 
-
 version: '2.1'
 
 
@@ -95,7 +95,7 @@ services:
   # PHP
   # ------------------------------------------------------------
   php:
-    image: devilbox/php-fpm:${PHP_SERVER}-work-0.94
+    image: devilbox/php-fpm:${PHP_SERVER}-work-0.95
     hostname: php
 
     ##
@@ -210,7 +210,7 @@ services:
   # Web Server
   # ------------------------------------------------------------
   httpd:
-    image: devilbox/${HTTPD_SERVER}:0.30
+    image: devilbox/${HTTPD_SERVER}:0.31
     hostname: httpd
 
     environment:
@@ -309,7 +309,7 @@ services:
   # MySQL Database
   # ------------------------------------------------------------
   mysql:
-    image: devilbox/mysql:${MYSQL_SERVER}-0.3
+    image: devilbox/mysql:${MYSQL_SERVER}-0.4
     hostname: mysql
 
     environment:

diff --git a/env-example b/env-example
@@ -261,8 +261,8 @@ DEVILBOX_VENDOR_PHPPGADMIN_AUTOLOGIN=1
 #PHP_SERVER=5.6
 #PHP_SERVER=7.0
 #PHP_SERVER=7.1
-PHP_SERVER=7.2
-#PHP_SERVER=7.3
+#PHP_SERVER=7.2
+PHP_SERVER=7.3
 #PHP_SERVER=7.4
 #PHP_SERVER=8.0
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,7 +26,7 @@ ACCEPT_EULA=N @@
     ###
     ### Where to retrieve the deb package
     ###
-    MSODBC_URL="https://packages.microsoft.com/debian/8/prod/pool/main/m/msodbcsql17/"
+    MSODBC_URL="https://packages.microsoft.com/debian/9/prod/pool/main/m/msodbcsql17/"
     ###
@@ Expand Down @@