Fix preview release handling for docker github and repo publish (#3084)

Author: dphulkar-msft

build-1es-pipeline.yaml

@@ -920,40 +920,43 @@ extends:
 
                   - script: |
                       mv azcopy_linux_amd64 azcopy
+                      # (~) to be replaced by (-) if azcopy version contains a tilde as this is not supported in docker image tags
+                      azcopy_docker_version=$(echo $(azcopy_version) | sed 's/~/-/')
+                      echo "##vso[task.setvariable variable=azcopy_docker_version]$azcopy_docker_version"
                     displayName: 'Setup AzCopy in expected location'
 
                   - task: 1ES.BuildContainerImage@1
                     inputs:
-                      image: azcopycontainers.azurecr.io/azure-azcopy-ubuntu-x86_64.$(azcopy_version):latest
+                      image: azcopycontainers.azurecr.io/azure-azcopy-ubuntu-x86_64.$(azcopy_docker_version):latest
                       path: '$(System.DefaultWorkingDirectory)'
                       dockerfile: docker/Dockerfile
 
                   - task: 1ES.PushContainerImage@1
                     inputs:
-                      image: azcopycontainers.azurecr.io/azure-azcopy-ubuntu-x86_64.$(azcopy_version):latest
-                      remoteImage: azcopycontainers.azurecr.io/azure-azcopy-ubuntu-x86_64.$(azcopy_version):latest
+                      image: azcopycontainers.azurecr.io/azure-azcopy-ubuntu-x86_64.$(azcopy_docker_version):latest
+                      remoteImage: azcopycontainers.azurecr.io/azure-azcopy-ubuntu-x86_64.$(azcopy_docker_version):latest
 
                   - task: 1ES.BuildContainerImage@1
                     inputs:
-                      image: azcopycontainers.azurecr.io/azure-azcopy-mariner-x86_64.$(azcopy_version):latest
+                      image: azcopycontainers.azurecr.io/azure-azcopy-mariner-x86_64.$(azcopy_docker_version):latest
                       path: '$(System.DefaultWorkingDirectory)'
                       dockerfile: docker/DockerfileMariner
 
                   - task: 1ES.PushContainerImage@1
                     inputs:
-                      image: azcopycontainers.azurecr.io/azure-azcopy-mariner-x86_64.$(azcopy_version):latest
-                      remoteImage: azcopycontainers.azurecr.io/azure-azcopy-mariner-x86_64.$(azcopy_version):latest
+                      image: azcopycontainers.azurecr.io/azure-azcopy-mariner-x86_64.$(azcopy_docker_version):latest
+                      remoteImage: azcopycontainers.azurecr.io/azure-azcopy-mariner-x86_64.$(azcopy_docker_version):latest
 
                   - task: 1ES.BuildContainerImage@1
                     inputs:
-                      image: azcopycontainers.azurecr.io/azure-azcopy-mariner-arm64.$(azcopy_version):latest
+                      image: azcopycontainers.azurecr.io/azure-azcopy-mariner-arm64.$(azcopy_docker_version):latest
                       path: '$(System.DefaultWorkingDirectory)'
                       dockerfile: docker/DockerfileMarinerArm64
 
                   - task: 1ES.PushContainerImage@1
                     inputs:
-                      image: azcopycontainers.azurecr.io/azure-azcopy-mariner-arm64.$(azcopy_version):latest
-                      remoteImage: azcopycontainers.azurecr.io/azure-azcopy-mariner-arm64.$(azcopy_version):latest
+                      image: azcopycontainers.azurecr.io/azure-azcopy-mariner-arm64.$(azcopy_docker_version):latest
+                      remoteImage: azcopycontainers.azurecr.io/azure-azcopy-mariner-arm64.$(azcopy_docker_version):latest
 
               - job: LinuxARM64
                 pool:
@@ -981,18 +984,21 @@ extends:
 
                   - script: |
                       mv azcopy_linux_arm64 azcopy
+                      # (~) to be replaced by (-) if azcopy version contains a tilde as this is not supported in docker image tags
+                      azcopy_docker_version=$(echo $(azcopy_version) | sed 's/~/-/')
+                      echo "##vso[task.setvariable variable=azcopy_docker_version]$azcopy_docker_version"
                     displayName: 'Setup AzCopy in expected location'
 
                   - task: 1ES.BuildContainerImage@1
                     inputs:
-                      image: azcopycontainers.azurecr.io/azure-azcopy-ubuntu-arm64.$(azcopy_version):latest
+                      image: azcopycontainers.azurecr.io/azure-azcopy-ubuntu-arm64.$(azcopy_docker_version):latest
                       path: '$(System.DefaultWorkingDirectory)'
                       dockerfile: docker/Dockerfile
 
                   - task: 1ES.PushContainerImage@1
                     inputs:
-                      image: azcopycontainers.azurecr.io/azure-azcopy-ubuntu-arm64.$(azcopy_version):latest
-                      remoteImage: azcopycontainers.azurecr.io/azure-azcopy-ubuntu-arm64.$(azcopy_version):latest
+                      image: azcopycontainers.azurecr.io/azure-azcopy-ubuntu-arm64.$(azcopy_docker_version):latest
+                      remoteImage: azcopycontainers.azurecr.io/azure-azcopy-ubuntu-arm64.$(azcopy_docker_version):latest
 
       - ${{ if eq(parameters.post_release, true) }}:
           - stage: ReleaseToGithub
@@ -1013,6 +1019,9 @@ extends:
 
                   - script: |
                       echo "v$(azcopy_version)"
+                      # (~) to be replaced by (-) if azcopy version contains a tilde as this is not supported in github tags
+                      azcopy_github_tag=$(echo $(azcopy_version) | sed 's/~/-/')
+                      echo "##vso[task.setvariable variable=azcopy_github_tag]$azcopy_github_tag"
                     displayName: 'AzCopy Tag Name'
 
                   - task: GithubRelease@1
@@ -1023,7 +1032,7 @@ extends:
                       target: '$(Build.SourceVersion)'
                       tagSource: 'userSpecifiedTag'
                       title: "AzCopy v$(azcopy_version)"
-                      tag: "v$(azcopy_version)"
+                      tag: "v$(azcopy_github_tag)"
                       changeLogCompareToRelease: 'lastFullRelease'
                       changeLogType: 'commitBased'
                       isDraft: ${{ parameters.draft }}
@@ -1150,7 +1159,7 @@ extends:
                         is_preview="true"
                         echo "##vso[task.setvariable variable=is_preview]$is_preview"
                       fi
-                      
+
                       while IFS=, read -r distro archetype repoName releaseName; do
                         # If the package is preview, publish to mariner preview package
                         if [[ $distro == *"Mariner-"* ]]; then
@@ -1171,7 +1180,7 @@ extends:
                           echo "Skipping for ARM type on $distro"
                         else
                           if [[ $distro == *"Mariner-"* ]]; then
-                            if [ "$is_preview" = "true" ]; then
+                            if [ "$(is_preview)" = "true" ]; then
                               repoName=$(echo $repoName | sed 's/prod/preview/')
                             fi
                           fi

docker/DockerfileMarinerArm64

@@ -1,9 +1,5 @@
 # Create container based on mariner 2.0 image
-FROM --platform=linux/arm64 mcr.microsoft.com/cbl-mariner/base/core:2.0
-
-# Install dependencies
-RUN tdnf update -y
-RUN tdnf install -y ca-certificates
+FROM mcr.microsoft.com/cbl-mariner/base/core:2.0
 
 # Copy azcopy binary to executable path
 COPY ./azcopy /usr/local/bin/