Add a setting to control the compose command used #3478
Conversation
| @@ -1604,7 +1604,7 @@ | |||
| "type": "string" | |||
| } | |||
| ], | |||
| "default": "docker build --pull --rm -f \"${dockerfile}\" -t ${tag} \"${context}\"", | |||
| "default": "${config:docker.dockerPath} build --pull --rm -f \"${dockerfile}\" -t ${tag} \"${context}\"", | |||
There was a problem hiding this comment.
Rather than always running docker ..., we can pick up the setting they apply with docker.dockerPath. In contrast to docker.composeCommand, that setting is not unset by default, because we aren't attempting to do any autodetection.
| @@ -1932,14 +1932,7 @@ | |||
| "default": [ | |||
| { | |||
| "label": "Compose Down", | |||
| "template": "docker-compose ${configurationFile} down", | |||
There was a problem hiding this comment.
Since we now intelligently choose the compose command, we no longer need separate command templates based on context for compose down. It is still needed for the two compose up commands, because ACI contexts lack a --build flag and will error if it is present.
| @@ -51,7 +50,6 @@ export abstract class DockerTaskProvider implements TaskProvider { | |||
| context.platform = getPlatform(task.definition); | |||
|
|
|||
| context.actionContext.telemetry.properties.dockerPlatform = context.platform; | |||
| context.actionContext.telemetry.properties.orchestration = 'single' as DockerOrchestration; // TODO: docker-compose, when support is added | |||
There was a problem hiding this comment.
No longer needed, as the task name is an exact hint as to whether we're dealing with single or compose orchestration.
| @@ -166,16 +165,7 @@ export async function selectCommandTemplate( | |||
| actionContext.telemetry.properties.commandContextType = `[${selectedTemplate.contextTypes?.join(', ') ?? ''}]`; | |||
| actionContext.telemetry.properties.currentContextType = currentContextType; | |||
|
|
|||
| let resolvedCommand = resolveVariables(selectedTemplate.template, folder, additionalVariables); | |||
There was a problem hiding this comment.
Since the command template is now based on the setting, this is no longer needed to rewrite commands to match what they used in settings.
|
Doc PR: microsoft/vscode-docs#5267 |
Fixes #2977. A string setting,
docker.composeCommandis added. If unset, the extension will try to usedocker composeby runningdocker compose version; if it succeeds we assume we can usedocker compose, otherwise we usedocker-compose. If the context or settings are altered, we will re-run that check, since different contexts have different requirements (for example, ACI contexts requiredocker compose, not supportingdocker-composeat all).I expect few people will need to force
docker-composewhendocker composedoes work, but for them, they can use the setting in either workspace or user settings.I marked #2977 as having documentation impact, because it will require documenting the new
${composeCommand}placeholder in command customization.Scenarios to test:
docker-buildtaskdocker-runtaskdocker-composetaskdocker compose