diff --git a/cmf-cli/resources/template_feed/init/Builds/CD-Containers.yml b/cmf-cli/resources/template_feed/init/Builds/CD-Containers.yml
index 672c8c96..e7c917ec 100644
--- a/cmf-cli/resources/template_feed/init/Builds/CD-Containers.yml
+++ b/cmf-cli/resources/template_feed/init/Builds/CD-Containers.yml
@@ -15,7 +15,8 @@ resources:
source: CI-Publish
branch: $(Build.SourceBranch)
project: '<%= $CLI_PARAM_ProjectName %>'
- trigger: true
+ trigger:
+ enabled: true
variables:
- group: Docker Variables
@@ -307,12 +308,11 @@ stages:
targetType: 'inline'
script: |
$packageSourceShare = "$(CandidatePackages)/Package"
- Copy-Item -Path $(DATABASE_NETWORK_SHARE)/approved/Cmf.FullBackup.*.zip -Destination $packageSourceShare -Force
+ Copy-Item -Path $(DATABASE_NETWORK_SHARE)/approved/Cmf.FullBackup.*.zip -Destination $packageSourceShare -Force -Verbose
if (Test-Path "Configurations/EnvironmentConfigs/devopscenter.qa.json" -PathType leaf)
{
Copy-Item -Path Configurations/EnvironmentConfigs/devopscenter.qa.json -Destination $env:AGENT_TEMPDIRECTORY/node_modules/@criticalmanufacturing/portal/bin/appsettings.json -Force
}
-
& $env:AGENT_TEMPDIRECTORY/node_modules/@criticalmanufacturing/portal/bin/cmf-portal.exe login --token $(CustomerPortalPAT) --verbose
& $env:AGENT_TEMPDIRECTORY/node_modules/@criticalmanufacturing/portal/bin/cmf-portal.exe deploy `
--name "${{ variables.CustomerEnvironmentName }}" `
@@ -322,7 +322,8 @@ stages:
--site "${{ variables.SiteName }}" `
--target "${{ variables.DeploymentTarget }}" `
--package="${{ variables.DeploymentPackage }}" `
- --replace-tokens TargetVersion=${{ variables.MESVersion }} --verbose
+ --replace-tokens TargetVersion=${{ variables.MESVersion }} --verbose `
+ --terminateOtherVersions
# Clean
- task: PostBuildCleanup@3
diff --git a/docs/cmf/Cmf_Common_Cli_Constants.md b/docs/cmf/Cmf_Common_Cli_Constants.md
index 0970c0c8..1bb79857 100644
--- a/docs/cmf/Cmf_Common_Cli_Constants.md
+++ b/docs/cmf/Cmf_Common_Cli_Constants.md
@@ -45,6 +45,24 @@ public const string CmfPackagePresentationConfig = config.json;
#### Field Value
[System.String](https://docs.microsoft.com/en-us/dotnet/api/System.String 'System.String')
+
+## CliConstants.DefaultOrganization Field
+The default organization for naming new packages
+```csharp
+public const string DefaultOrganization = Cmf;
+```
+#### Field Value
+[System.String](https://docs.microsoft.com/en-us/dotnet/api/System.String 'System.String')
+
+
+## CliConstants.DefaultProduct Field
+the default product to name new packages
+```csharp
+public const string DefaultProduct = Custom;
+```
+#### Field Value
+[System.String](https://docs.microsoft.com/en-us/dotnet/api/System.String 'System.String')
+
## CliConstants.DeploymentFrameworkManifestFileName Field
The deployment framework manifest template
diff --git a/docs/cmf/cmf.xml b/docs/cmf/cmf.xml
index b3e749c8..239d4a4d 100644
--- a/docs/cmf/cmf.xml
+++ b/docs/cmf/cmf.xml
@@ -1545,6 +1545,16 @@
npm.js repository url
+
+
+ The default organization for naming new packages
+
+
+
+
+ the default product to name new packages
+
+
The token start element