Merge pull request #663 from cytopia/release/v1.6.1

Release v1.6.1
cytopia · Jan 5, 2020 · bf140cf · bf140cf
2 parents 556b50d + ed8639c
commit bf140cf
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 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.6.0';
-$DEVILBOX_DATE = '2020-01-04';
+$DEVILBOX_VERSION = 'v1.6.1';
+$DEVILBOX_DATE = '2020-01-05';
 $DEVILBOX_API_PAGE = 'devilbox-api/status.json';
 
 //

diff --git a/.devilbox/www/include/lib/container/Php.php b/.devilbox/www/include/lib/container/Php.php
@@ -82,7 +82,7 @@ public function getPhalconVersion()
 	}
 	public function getSymfonyVersion()
 	{
-		$output = loadClass('Helper')->exec('symfony --version 2>/dev/null', $output);
+		$output = loadClass('Helper')->exec('symfony -V 2>/dev/null | tr -d "[:cntrl:]" | sed "s/\[[0-9]*m//g"', $output);
 		return loadClass('Helper')->egrep('/[0-9.]+/', $output);
 	}
 	public function getWpcliVersion()

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,12 @@ major versions.
 ## Unreleased
 
 
+## Bugfix Release v1.6.1 (2019-01-05)
+
+#### Fixed
+- [#662](https://github.com/cytopia/devilbox/issues/662) Update to latest Symfony CLI
+
+
 ## Release v1.6.0 (2020-01-04)
 
 #### Changed

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -95,7 +95,7 @@ services:
   # PHP
   # ------------------------------------------------------------
   php:
-    image: devilbox/php-fpm:${PHP_SERVER}-work-0.100
+    image: devilbox/php-fpm:${PHP_SERVER}-work-0.101
     hostname: php
 
     ##