Skip to content

Fix parsing of docker-compose output. #424

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bulldozer-bot merged 2 commits into from
Dec 18, 2019
Merged

Fix parsing of docker-compose output. #424

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5da996
Fix parsing of docker-compose output.
GrahamDennis Dec 16, 2019
89a26f9
add changelog
GrahamDennis Dec 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fix parsing of docker-compose output. 
Newer versions of docker-compose (at least 1.25.0-rc4) adjust the output
based on the number of columns available in the terminal. This
interferes with parsing of the output. This is fixed by setting the
`COLUMNS` environment variable to an artificially large value.
  • Loading branch information
@GrahamDennis
GrahamDennis committed Dec 16, 2019
commit c5da996dac6bc9514ea2c39be5add96d949c8004
4 changes: 4 additions & 0 deletions ...compose-rule-core/src/main/java/com/palantir/docker/compose/connection/DockerMachine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,10 @@ public DockerMachine build() {
String hostIp = new RemoteHostIpResolver().resolveIp(dockerHost);

Map<String, String> environment = ImmutableMap.<String, String>builder()
// 2019-12-17: newer docker-compose adjusts its output based on the number of columns available
// in the terminal. This interferes with parsing of the output of docker-compose, so "COLUMNS" is
// set to an artificially large value.
.put("COLUMNS", "10000")
.putAll(dockerEnvironment)
.putAll(additionalEnvironment)
.build();
Expand Down