From 3d4d2b50aee3f4800e27fc23c802262444ace2e0 Mon Sep 17 00:00:00 2001 From: Matt Hook Date: Thu, 14 Jul 2022 10:40:34 +1200 Subject: [PATCH] update wording, docker-compose to docker compose (#7233) --- .../edge-stack-deployment-type-selector.controller.js | 2 +- .../components/edit-edge-stack-form/editEdgeStackForm.html | 2 +- .../docker-compose-form/docker-compose-form.html | 4 ++-- app/kubernetes/views/deploy/deployController.js | 2 +- .../createCustomTemplateView.html | 2 +- .../custom-templates-view/customTemplatesView.html | 2 +- .../edit-custom-template-view/editCustomTemplateView.html | 2 +- app/portainer/views/stacks/create/createstack.html | 6 +++--- app/portainer/views/stacks/edit/stack.html | 6 +++--- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/edge/components/edge-stack-deployment-type-selector/edge-stack-deployment-type-selector.controller.js b/app/edge/components/edge-stack-deployment-type-selector/edge-stack-deployment-type-selector.controller.js index 3cedd0464..d0f2de8d7 100644 --- a/app/edge/components/edge-stack-deployment-type-selector/edge-stack-deployment-type-selector.controller.js +++ b/app/edge/components/edge-stack-deployment-type-selector/edge-stack-deployment-type-selector.controller.js @@ -2,7 +2,7 @@ export default class EdgeStackDeploymentTypeSelectorController { /* @ngInject */ constructor() { this.deploymentOptions = [ - { id: 'deployment_compose', icon: 'fab fa-docker', label: 'Compose', description: 'docker-compose format', value: 0 }, + { id: 'deployment_compose', icon: 'fab fa-docker', label: 'Compose', description: 'Docker compose format', value: 0 }, { id: 'deployment_kube', icon: 'fa fa-cubes', diff --git a/app/edge/components/edit-edge-stack-form/editEdgeStackForm.html b/app/edge/components/edit-edge-stack-form/editEdgeStackForm.html index 76f76d15d..cc1a70713 100644 --- a/app/edge/components/edit-edge-stack-form/editEdgeStackForm.html +++ b/app/edge/components/edit-edge-stack-form/editEdgeStackForm.html @@ -36,7 +36,7 @@ value="$ctrl.model.StackFileContent" yml="true" identifier="compose-editor" - placeholder="# Define or paste the content of your docker-compose file here" + placeholder="# Define or paste the content of your docker compose file here" on-change="($ctrl.onChangeComposeConfig)" > diff --git a/app/edge/views/edge-stacks/createEdgeStackView/docker-compose-form/docker-compose-form.html b/app/edge/views/edge-stacks/createEdgeStackView/docker-compose-form/docker-compose-form.html index 5678639de..230890dc1 100644 --- a/app/edge/views/edge-stacks/createEdgeStackView/docker-compose-form/docker-compose-form.html +++ b/app/edge/views/edge-stacks/createEdgeStackView/docker-compose-form/docker-compose-form.html @@ -8,7 +8,7 @@ on-change="($ctrl.onChangeFileContent)" ng-required="true" yml="true" - placeholder="# Define or paste the content of your docker-compose file here" + placeholder="# Define or paste the content of your docker compose file here" > You can get more information about Compose file format in the @@ -55,7 +55,7 @@ value="$ctrl.formValues.StackFileContent" on-change="($ctrl.onChangeFileContent)" yml="true" - placeholder="# Define or paste the content of your docker-compose file here" + placeholder="# Define or paste the content of your docker compose file here" ng-required="true" > diff --git a/app/kubernetes/views/deploy/deployController.js b/app/kubernetes/views/deploy/deployController.js index 2cb07002d..1b5ff6674 100644 --- a/app/kubernetes/views/deploy/deployController.js +++ b/app/kubernetes/views/deploy/deployController.js @@ -28,7 +28,7 @@ class KubernetesDeployController { this.deployOptions = [ buildOption('method_kubernetes', 'fa fa-cubes', 'Kubernetes', 'Kubernetes manifest format', KubernetesDeployManifestTypes.KUBERNETES), - buildOption('method_compose', 'fab fa-docker', 'Compose', 'docker-compose format', KubernetesDeployManifestTypes.COMPOSE), + buildOption('method_compose', 'fab fa-docker', 'Compose', 'Docker compose format', KubernetesDeployManifestTypes.COMPOSE), ]; this.methodOptions = [ diff --git a/app/portainer/views/custom-templates/create-custom-template-view/createCustomTemplateView.html b/app/portainer/views/custom-templates/create-custom-template-view/createCustomTemplateView.html index 6e881e9c8..5ee02b659 100644 --- a/app/portainer/views/custom-templates/create-custom-template-view/createCustomTemplateView.html +++ b/app/portainer/views/custom-templates/create-custom-template-view/createCustomTemplateView.html @@ -66,7 +66,7 @@
- This stack will be deployed using the equivalent of docker-compose. Only Compose file format version 2 is supported at the moment. + This stack will be deployed using the equivalent of docker compose. Only Compose file format version 2 is supported at the moment.
Note: Due to a limitation of libcompose, the name of the stack will be standardized to remove all special characters and uppercase letters.
- This stack will be deployed using docker-compose. + This stack will be deployed using docker compose.
@@ -151,7 +151,7 @@ on-change="(onChangeFileContent)" ng-required="true" yml="true" - placeholder="# Define or paste the content of your docker-compose file here" + placeholder="# Define or paste the content of your docker compose file here" > diff --git a/app/portainer/views/stacks/edit/stack.html b/app/portainer/views/stacks/edit/stack.html index f2cbc0214..02044d850 100644 --- a/app/portainer/views/stacks/edit/stack.html +++ b/app/portainer/views/stacks/edit/stack.html @@ -133,10 +133,10 @@
- This stack will be deployed using the equivalent of docker-compose. Only Compose file format version 2 is supported at the moment. + This stack will be deployed using the equivalent of docker compose. Only Compose file format version 2 is supported at the moment. - This stack will be deployed using docker-compose. + This stack will be deployed using docker compose. You can get more information about Compose file format in the official documentation. @@ -147,7 +147,7 @@