add release.props for docker image versions

Author: VeryEarly

build.proj

@@ -244,7 +244,7 @@
 
   <Target Name="BuildImage">
     <Exec Command="$(PowerShellCoreCommandPrefix) &quot;. $(DockerTools)/GetArtifacts.ps1 -Artifacts $(RepoArtifacts) -Docker $(DockerRoot) &quot;" />
-    <Exec Command="$(PowerShellCoreCommandPrefix) &quot;. $(DockerTools)/BuildImages.ps1 -DOCKER $(DockerRoot) -IMAGENAME $(DockerImageName) &quot;" />
+    <Exec Command="$(PowerShellCoreCommandPrefix) &quot;. $(DockerTools)/BuildImages.ps1 -DOCKER $(DockerRoot) -DockerImageName $(DockerImageName) &quot;" />
     <Exec Command="$(PowerShellCoreCommandPrefix) &quot;. $(DockerTools)/CleanArtifacts.ps1 -Docker $(DockerRoot) &quot;" />
   </Target>
 

docker/config/release.props

@@ -0,0 +1 @@
+az.version=3.3.0

tools/RunVersionController.ps1

@@ -154,6 +154,19 @@ function Update-ChangeLog
     ($Content + $ChangeLogContent) | Set-Content -Path $ChangeLogFile.FullName -Encoding UTF8
 }
 
+function Update-Image-Releases
+{
+    Param(
+        [Parameter(Mandatory = $true)]
+        [string]$ReleaseProps,
+        [Parameter(Mandatory = $true)]
+        [string]$AzVersion
+    )
+
+    $content = Get-Content $ReleaseProps
+    $content -Replace "az.version=\d+\.\d+\.\d+", "az.version=$AzVersion" | Set-Content $ReleaseProps
+}
+
 function Get-ExistSerializedCmdletJsonFile
 {
     return $(ls "$PSScriptRoot\Tools.Common\SerializedCmdlets").Name
@@ -287,5 +300,6 @@ switch ($PSCmdlet.ParameterSetName)
 
         Update-ModuleManifest -Path "$PSScriptRoot\Az\Az.psd1" -ModuleVersion $newVersion -ReleaseNotes $releaseNotes
         Update-ChangeLog -Content $changeLog -RootPath $rootPath
+        Update-Image-Releases -ReleaseProps "$rootPath\docker\config\release.props" -AzVersion $newVersion
     }
 }

tools/docker/BuildImages.ps1

@@ -16,17 +16,16 @@ param(
     [string]$DOCKER,
 
     [Parameter(Mandatory = $true)]
-    [string]$IMAGENAME
+    [string]$DockerImageName
 )
 
-##TODO:read version from file
-$version = 12345
+$version = (Get-Content "$DOCKER/config/release.props" | Select-String "az.version").ToString().Split("=")[1]
 
 try {
     foreach ($dockerfile in (Get-ChildItem -Path $DOCKER -Filter "Dockerfile-*").FullName) {
         $os = $dockerfile.split("Dockerfile-")[1]
         Write-Output $os
-        docker build -t $IMAGENAME':'$version"-"$os -f $dockerfile $DOCKER
+        docker build --build-arg VERSION=$version -t $DockerImageName':'$version"-"$os -f $dockerfile $DOCKER
     }
 } catch {
     $Errors = $_