Merge pull request #655 from cytopia/release/v1.4.0

Release v1.4.0
Adjust release date
2025-06-24 18:25:17 +00:00 · 2020-01-02 18:32:22 +01:00 · 2020-01-02 16:12:30 +01:00 · 2019-12-31 18:42:42 +01:00 · 2019-12-31 18:41:13 +01:00 · 2019-12-31 18:13:52 +01:00
14 changed files with 39 additions and 20 deletions
--- a/.devilbox/www/config.php
+++ b/.devilbox/www/config.php
@ -13,8 +13,8 @@ error_reporting(-1);
 putenv('RES_OPTIONS=retrans:1 retry:1 timeout:1 attempts:1');


-$DEVILBOX_VERSION = 'v1.3.0';
-$DEVILBOX_DATE = '2019-12-29';
+$DEVILBOX_VERSION = 'v1.4.0';
+$DEVILBOX_DATE = '2020-01-02';
 $DEVILBOX_API_PAGE = 'devilbox-api/status.json';

 //
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -7,6 +7,17 @@ major versions.
 ## Unreleased


+## Release v1.4.0 (2020-01-02)
+
+#### Fixed
+- [#618](https://github.com/cytopia/devilbox/issues/618) Update Compose version to 2.3
+- [#614](https://github.com/cytopia/devilbox/issues/614) Update to latest mhsendmail binary with `-o` flag
+- [#265](https://github.com/cytopia/devilbox/issues/265) Fix http to https redirect for projects
+
+#### Changed
+- [#642](https://github.com/cytopia/devilbox/issues/642) Be able to disable email catch-all and still run postfix
+
+
 ## Release v1.3.0 (2019-12-29)

 #### Fixed
--- a/README.md
+++ b/README.md
@ -51,8 +51,8 @@ Furthermore, the Devilbox provides an **identical** and **reproducible developme
 ![Plus](https://raw.githubusercontent.com/cytopia/icons/master/64x64/plus.png)
 ![Docker](https://raw.githubusercontent.com/cytopia/icons/master/64x64/docker.png)

-* [Docker Engine 1.12.0+](https://docs.docker.com/compose/compose-file/compose-versioning/#version-21)
-* [Docker Compose 1.9.0+](https://docs.docker.com/compose/compose-file/compose-versioning/#version-21)
+* [Docker Engine 17.06.0+](https://docs.docker.com/compose/compose-file/compose-versioning/#version-23)
+* [Docker Compose 1.16.0+](https://docs.docker.com/compose/compose-file/compose-versioning/#version-23)

 ## Architecture

--- a/compose/docker-compose.override.yml-all
+++ b/compose/docker-compose.override.yml-all
@ -1,5 +1,6 @@
 # vim: set ft=yaml:
-version: '2.1'
+---
+version: '2.3'

 ###
 ### Services
--- a/compose/docker-compose.override.yml-blackfire
+++ b/compose/docker-compose.override.yml-blackfire
@ -1,5 +1,6 @@
 # vim: set ft=yaml:
-version: '2.1'
+---
+version: '2.3'

 services:

--- a/compose/docker-compose.override.yml-elk
+++ b/compose/docker-compose.override.yml-elk
@ -1,7 +1,7 @@
 # vim: set ft=yaml:
 # https://www.docker.elastic.co
-
-version: '2.1'
+---
+version: '2.3'

 services:

--- a/compose/docker-compose.override.yml-mailhog
+++ b/compose/docker-compose.override.yml-mailhog
@ -1,5 +1,6 @@
 # vim: set ft=yaml:
-version: '2.1'
+---
+version: '2.3'

 services:

--- a/compose/docker-compose.override.yml-ngrok
+++ b/compose/docker-compose.override.yml-ngrok
@ -1,5 +1,6 @@
 # vim: set ft=yaml:
-version: '2.1'
+---
+version: '2.3'

 services:

--- a/compose/docker-compose.override.yml-rabbitmq
+++ b/compose/docker-compose.override.yml-rabbitmq
@ -1,5 +1,6 @@
 # vim: set ft=yaml:
-version: '2.1'
+---
+version: '2.3'

 services:

--- a/compose/docker-compose.override.yml-solr
+++ b/compose/docker-compose.override.yml-solr
@ -1,5 +1,6 @@
 # vim: set ft=yaml:
-version: '2.1'
+---
+version: '2.3'

 services:

--- a/compose/docker-compose.override.yml-varnish
+++ b/compose/docker-compose.override.yml-varnish
@ -1,5 +1,6 @@
 # vim: set ft=yaml:
-version: '2.1'
+---
+version: '2.3'

 services:

--- a/docker-compose.override.yml-example
+++ b/docker-compose.override.yml-example
@ -1,5 +1,6 @@
 # IMPORTANT: The version must match the version of docker-compose.yml
-version: '2.1'
+---
+version: '2.3'

 # The following override shows an example for the cockroachdb
 services:
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -22,7 +22,7 @@
 ##   $ cp env-example .env
 ##

-version: '2.1'
+version: '2.3'


 ################################################################################
@ -95,7 +95,7 @@ services:
  # PHP
  # ------------------------------------------------------------
  php:
-    image: devilbox/php-fpm:${PHP_SERVER}-work-0.97
+    image: devilbox/php-fpm:${PHP_SERVER}-work-0.98
    hostname: php

    ##
@ -135,7 +135,7 @@ services:
      ##
      ## Mail-catching
      ##
-      - ENABLE_MAIL=1
+      - ENABLE_MAIL=2

      ##
      ## Enable 127.0.0.1 Port-forwarding
@ -210,7 +210,7 @@ services:
  # Web Server
  # ------------------------------------------------------------
  httpd:
-    image: devilbox/${HTTPD_SERVER}:0.31
+    image: devilbox/${HTTPD_SERVER}:0.32
    hostname: httpd

    environment:
--- a/docs/getting-started/prerequisites.rst
+++ b/docs/getting-started/prerequisites.rst
@ -53,8 +53,8 @@ The only requirements for the Devilbox is to have ``Docker`` and ``Docker Compos
 everything else is bundled and provided withing the Docker container.
 The minimum required versions are listed below:

-* ``Docker``: 1.12.0+
-* ``Docker Compose``: 1.9.0+
+* ``Docker``: 17.06.0+
+* ``Docker Compose``: 1.16.0+


 Additionally you will require ``git`` in order to clone the devilbox project.
Author	SHA1	Message	Date
cytopia	7d1d3add5a	Merge pull request #655 from cytopia/release/v1.4.0 Release v1.4.0	2020-01-02 18:32:22 +01:00
cytopia	17735e09ce	Adjust release date	2020-01-02 16:12:30 +01:00
cytopia	ff143fe931	Fixes #265 HTTP to HTTPS redirect	2019-12-31 18:42:42 +01:00
cytopia	72c7a7db02	Fixes #642 Fixes #614 Updated PHP Docker image	2019-12-31 18:41:13 +01:00
cytopia	151246179d	Refs #618 Update Compose override file with new version	2019-12-31 18:13:52 +01:00
cytopia	6e27f83b4d	Update Changelog	2019-12-31 17:47:57 +01:00
cytopia	616fed6326	Fixes #618 Update Compose version to 2.3	2019-12-31 17:37:32 +01:00