fixup! Separate Build Changes

Author: Sheyla Trudo

.pipelines/containers/container-template.jobs.yaml

@@ -26,38 +26,30 @@ jobs:
     - task: GoTool@0
       inputs:
         version: $(GO_VERSION)
-    
-    - task: AzureCLI@2
-      displayName: "Docker Login"
-      inputs:
-        azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
-        scriptLocation: "inlineScript"
-        scriptType: "bash"
-        addSpnToEnvironment: true
-        inlineScript: |
-          ls -la /bin
-      env:
-        ACR: ${{ parameters.containerRegistry.name }}
 
     - bash: |
         set -e
 
         BUILD_CONTEXT=$(make "$MAKE_BUILD_CONTEXT")
         echo >&2 "##vso[task.setvariable variable=BUILD_CONTEXT_${VAR_ID};]$BUILD_CONTEXT"
 
-        IMAGE_NAME_AND_TAG=$(make "$MAKE_IMG_NAME_AND_TAG")
+        IMAGE_PLATFORM_TAG=$(make "$MAKE_IMAGE_TAG")
+        echo >&2 "##vso[task.setvariable variable=IMAGE_PLATFORM_TAG_${VAR_ID};]$IMAGE_PLATFORM_TAG"
+
+        IMAGE_NAME_AND_TAG=$(make "$MAKE_IMAGE_NAME_AND_TAG")
         echo >&2 "##vso[task.setvariable variable=IMAGE_NAME_AND_TAG_${VAR_ID};]$IMAGE_NAME_AND_TAG"
 
         DOCKERFILE_PATH=$(make "$MAKE_DOCKERFILE_PATH")
         echo >&2 "##vso[task.setvariable variable=DOCKERFILE_PATH_${VAR_ID};]$DOCKERFILE_PATH"
 
         EXTRA_BUILD_ARGS=$(make "$MAKE_EXTRA_BUILD_ARGS")
         echo >&2 "##vso[task.setvariable variable=EXTRA_BUILD_ARGS_${VAR_ID};]$EXTRA_BUILD_ARGS"
-      displayName: "Get Image Name"
+      displayName: "Get Image Build Data"
       env:
         VAR_ID: ${{ image }}
+        MAKE_IMAGE_TAG: ${{ image }}-image-tag
         MAKE_BUILD_CONTEXT: ${{ image }}-image-build-context
-        MAKE_IMG_NAME_AND_TAG: ${{ image }}-image-name-and-tag
+        MAKE_IMAGE_NAME_AND_TAG: ${{ image }}-image-name-and-tag
         MAKE_DOCKERFILE_PATH: ${{ image }}-dockerfile-path
         MAKE_EXTRA_BUILD_ARGS: ${{ image }}-docker-build-args
 

.pipelines/containers/container-template.steps.yaml

@@ -29,8 +29,8 @@ steps:
   inputs:
     image: $(IMAGE_NAME_AND_TAG_${{ parameters.name }})
     dockerfile: $(DOCKERFILE_PATH_${{ parameters.name }})
-    path: $(BUILD_CONTEXT_${{ parameters.name }})
-    buildArguments: TARGET=${{ parameters.os }} OS=${{ parameters.os }} PLATFORM=${{ parameters.os }} ARCH=${{ parameters.arch }} $(EXTRA_BUILD_ARGS_${{ parameters.name }})
+    path: $(Build.SourcesDirectory)
+    buildArguments: --platform "${{ parameters.os }}/${{ parameters.arch }}" --build-arg ARCH="${{ parameters.arch }}" --build-arg OS="${{ parameters.os }}" --build-arg PLATFORM="${{ parameters.os }}/${{ parameters.arch }}" --build-arg VERSION="$(IMAGE_PLATFORM_TAG_${{ parameters.name }})" --target "${{ parameters.os }}" $(EXTRA_BUILD_ARGS_${{ parameters.name }})
     enableNetwork: true
     enablePull: false
     enableCache: true

.pipelines/trigger.yaml

@@ -45,6 +45,8 @@ extends:
       name: $(BUILD_POOL_NAME_DEFAULT)
       os: linux
       image: acn-runner-vmss-image-1es-v3.0
+    featureFlags:
+      automaticContainerPatching: true
     sdl:
       sourceAnalysisPool: 
         name: $(BUILD_POOL_NAME_DEFAULT_WINDOWS)

Makefile

@@ -346,7 +346,7 @@ acncli-dockerfile-path:
 	@echo "$(DOCKERFILE_PATH)"
 
 acncli-docker-build-args:
-	$(eval DOCKER_BUILD_ARGS := ;)
+	$(eval DOCKER_BUILD_ARGS := '')
 	@echo $(DOCKER_BUILD_ARGS)
 
 acncli-image: acncli-dockerfile-path acncli-build-args ## build cni-manager container image.
@@ -372,6 +372,9 @@ acncli-image-pull: ## pull cni-manager container image.
 azure-ipam-image-name: # util target to print the azure-ipam  image name.
 	@echo $(AZURE_IPAM_IMAGE)
 
+azure-ipam-image-tag: 
+	@echo $(AZURE_IPAM_PLATFORM_TAG)
+
 azure-ipam-image-name-and-tag: # util target to print the azure-ipam image name and tag.
 	@echo $(IMAGE_REGISTRY)/$(AZURE_IPAM_IMAGE):$(AZURE_IPAM_PLATFORM_TAG)
 
@@ -384,7 +387,7 @@ azure-ipam-dockerfile-path:
 	@echo "$(DOCKERFILE_PATH)"
 
 azure-ipam-docker-build-args:
-	$(eval DOCKER_BUILD_ARGS := ;)
+	$(eval DOCKER_BUILD_ARGS := '')
 	@echo $(DOCKER_BUILD_ARGS)
 
 azure-ipam-image: ## build azure-ipam container image.
@@ -413,6 +416,9 @@ azure-ipam-image-pull: ## pull azure-ipam container image.
 ipv6-hp-bpf-image-name: # util target to print the ipv6-hp-bpf image name.
 	@echo $(IPV6_HP_BPF_IMAGE)
 
+ipv6-hp-bpf-image-tag:
+	@echo $(IPV6_HP_BPF_IMAGE_PLATFORM_TAG)
+
 ipv6-hp-bpf-image-name-and-tag: # util target to print the ipv6-hp-bpf image name and tag.
 	@echo $(IMAGE_REGISTRY)/$(IPV6_HP_BPF_IMAGE):$(IPV6_HP_BPF_IMAGE_PLATFORM_TAG)
 
@@ -425,7 +431,7 @@ ipv6-hp-bpf-dockerfile-path:
 	@echo "$(DOCKERFILE_PATH)"
 
 ipv6-hp-bpf-docker-build-args:
-	$(eval DOCKER_BUILD_ARGS := '--build-arg OS=$(OS) --build-arg ARCH=$(ARCH) --build-arg DEBUG=$(DEBUG)')
+	$(eval DOCKER_BUILD_ARGS := '--build-arg DEBUG=$(DEBUG)')
 	@echo $(DOCKER_BUILD_ARGS)
 
 ipv6-hp-bpf-image: ## build ipv6-hp-bpf container image.
@@ -454,6 +460,9 @@ ipv6-hp-bpf-image-pull: ## pull ipv6-hp-bpf container image.
 cni-image-name: # util target to print the cni image name.
 	@echo $(CNI_IMAGE)
 
+cni-image-tag: 
+	@echo $(CNI_PLATFORM_TAG)
+
 cni-image-name-and-tag: # util target to print the cni image name and tag.
 	@echo $(IMAGE_REGISTRY)/$(CNI_IMAGE):$(CNI_PLATFORM_TAG)
 
@@ -496,6 +505,9 @@ cni-image-pull: ## pull cni container image.
 cns-image-name: # util target to print the CNS image name
 	@echo $(CNS_IMAGE)
 
+cns-image-tag:
+	@echo $(CNS_PLATFORM_TAG)
+
 cns-image-name-and-tag: # util target to print the CNS image name and tag.
 	@echo $(IMAGE_REGISTRY)/$(CNS_IMAGE):$(CNS_PLATFORM_TAG)
 
@@ -537,6 +549,9 @@ cns-image-pull: ## pull cns container image.
 npm-image-name: # util target to print the NPM image name
 	@echo $(NPM_IMAGE)
 
+npm-image-tag: # util target to print the NPM image name and tag.
+	@echo $(NPM_PLATFORM_TAG)
+
 npm-image-name-and-tag: # util target to print the NPM image name and tag.
 	@echo $(IMAGE_REGISTRY)/$(NPM_IMAGE):$(NPM_PLATFORM_TAG)