Skip to content

Commit dfeefe9

Browse files
authored
Merge branch 'master' into develop
2 parents b72daeb + dbed4f5 commit dfeefe9

File tree

3 files changed

+27
-1
lines changed

3 files changed

+27
-1
lines changed

LICENSE

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
MIT License
2+
3+
Copyright (c) 2021 Ibragim Abubakarov
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,3 +76,8 @@ API Reference
7676
Tested Docker versions
7777
--------
7878
- #### [1.41](https://docs.docker.com/engine/api/v1.41/)
79+
80+
81+
License
82+
-------
83+
- [Review](LICENSE)

src/DockerClient.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ public function getContainerLogs($id, $level = 'all')
271271
$response = $this->request('GET', $endpoint, [], false);
272272

273273
$text = $response->getBody()->getContents();
274-
$text = preg_replace('/(?!\n)[\p{Cc}]/', '', $text);
274+
$text = utf8_encode($text);
275275

276276
return $text;
277277
} catch (GuzzleException $e) {

0 commit comments

Comments
 (0)