Also add fixed COLUMNS to localMachine

[cfredri4]

To fix issue with docker-compose when system terminal is narrow. Also harmonize code according to RemoteBuilder.build.

Before this PR

Parsing of docker-compose output fails when system terminal is narrow

After this PR

==COMMIT_MSG==
Make parsing of docker-compose output independent of local system terminal column width.
==COMMIT_MSG==

Possible downsides?

Probably none.

[changelog-app]

Generate changelog in changelog/@unreleased

Type

• Feature
• Improvement
• Fix
• Break
• Deprecation
• Manual task
• Migration

Description

Make parsing of docker-compose output independent of local system terminal column width.

Check the box to generate changelog(s)

• Generate changelog entry

[cfredri4]

Unit tests are failing but this seems unrelated?

[fawind]

Thanks for the PR @cfredri4!

For reference, this is the failing test:

docker-compose-rule/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/LocalBuilderShould.java

Lines 114 to 128 in 915c47f

	@Test
	public void override_system_environment_with_additional_environment() {
	Map<String, String> systemEnv = ImmutableMap.<String, String>builder()
	.put("ENV_1", "VAL_1")
	.build();
	Map<String, String> overrideEnv = ImmutableMap.<String, String>builder()
	.put("ENV_1", "DIFFERENT_VALUE")
	.build();
	DockerMachine localMachine = new LocalBuilder(DAEMON, systemEnv)
	.withEnvironment(overrideEnv)
	.build();
	assertThat(localMachine, not(containsEnvironment(systemEnv)));
	assertThat(localMachine, containsEnvironment(overrideEnv));
	}

It fails because it expects to override variables in the systemEnvironment with variables from the additionalEnvironment when both contain the same key. Previously, we used a HashMap for combining the environments, which allowed to overwrite an existing key with a new key-value pair.
When using ImmutableMap#builder, this is not allowed and results in an exception.

I would continue using the HashMap for building the combined environment as before.

[cfredri4]

Got it! Did this change in order to harmonize LocalBuilder and RemoteBuilder.
Now changed to allow same functionality in RemoteBuilder instead. ;-)