update wording, docker-compose to docker compose (#7233)

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',

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)"
   >
     <editor-description>

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"
 >
   <editor-description>
     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"
   >
   </web-editor-form>

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 = [

app/portainer/views/custom-templates/create-custom-template-view/createCustomTemplateView.html

@@ -66,7 +66,7 @@
               <div class="col-sm-12">
                 <code-editor
                   identifier="custom-template-creation-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"
                   yml="true"
                   value="$ctrl.formValues.FileContent"
                   on-change="($ctrl.editorUpdate)"

app/portainer/views/custom-templates/custom-templates-view/customTemplatesView.html

@@ -42,7 +42,7 @@
           <div class="col-sm-12">
             <code-editor
               identifier="custom-template-creation-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"
               yml="true"
               value="$ctrl.formValues.fileContent"
               on-change="($ctrl.editorUpdate)"

app/portainer/views/custom-templates/edit-custom-template-view/editCustomTemplateView.html

@@ -20,7 +20,7 @@
             <div class="col-sm-12">
               <code-editor
                 identifier="custom-template-creation-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"
                 yml="true"
                 value="$ctrl.formValues.FileContent"
                 on-change="($ctrl.editorUpdate)"

app/portainer/views/stacks/create/createstack.html

@@ -38,13 +38,13 @@
             </span>
             <div class="col-sm-12 text-muted small" ng-if="state.StackType === 2 && composeSyntaxMaxVersion == 2">
               <div style="margin-bottom: 7px">
-                This stack will be deployed using the equivalent of <code>docker-compose</code>. Only Compose file format version <b>2</b> is supported at the moment.
+                This stack will be deployed using the equivalent of <code>docker compose</code>. Only Compose file format version <b>2</b> is supported at the moment.
               </div>
               <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px"></i>
               Note: Due to a limitation of libcompose, the name of the stack will be standardized to remove all special characters and uppercase letters.
             </div>
             <span class="col-sm-12 text-muted small" ng-if="state.StackType === 2 && composeSyntaxMaxVersion > 2">
-              This stack will be deployed using <code>docker-compose</code>.
+              This stack will be deployed using <code>docker compose</code>.
             </span>
           </div>
           <!-- build-method -->
@@ -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"
           >
             <editor-description>
               <span class="col-sm-12 text-muted small">

app/portainer/views/stacks/edit/stack.html

@@ -133,10 +133,10 @@
             <form class="form-horizontal" ng-if="state.showEditorTab" style="margin-top: 10px" name="stackUpdateForm">
               <div class="form-group">
                 <span class="col-sm-12 text-muted small" style="margin-bottom: 7px" ng-if="stackType == 2 && composeSyntaxMaxVersion == 2">
-                  This stack will be deployed using the equivalent of <code>docker-compose</code>. Only Compose file format version <b>2</b> is supported at the moment.
+                  This stack will be deployed using the equivalent of <code>docker compose</code>. Only Compose file format version <b>2</b> is supported at the moment.
                 </span>
                 <span class="col-sm-12 text-muted small" style="margin-bottom: 7px" ng-if="stackType == 2 && composeSyntaxMaxVersion > 2">
-                  This stack will be deployed using <code>docker-compose</code>.
+                  This stack will be deployed using <code>docker compose</code>.
                 </span>
                 <span class="col-sm-12 text-muted small">
                   You can get more information about Compose file format in the <a href="https://docs.docker.com/compose/compose-file/" target="_blank">official documentation</a>.
@@ -147,7 +147,7 @@
                   <code-editor
                     read-only="orphaned"
                     identifier="stack-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"
                     yml="true"
                     on-change="(editorUpdate)"
                     value="stackFileContent"