Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions changelog/@unreleased/pr-424.v2.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
type: fix
fix:
description: |+
Fix parsing of docker-compose output

Set the `COLUMNS` environment variable to an artificially large value for the docker-compose process. This works around newer versions of docker-compose (at least 1.25.0-rc4+) which adjust their output based on the width of the terminal.

links:
- https://github.com/palantir/docker-compose-rule/pull/424
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