Skip to content

Commit 16949fb

Browse files
net-containers-bot[bot]net-containers-bot[bot]
committed
Update common Docker engineering infrastructure from mcr.microsoft.com/dotnet-buildtools/image-builder@sha256:ebaeb7008d62ececb11335024efcddfc8cdd118b572d6784856386760af14d6d
1 parent bef5ce3 commit 16949fb

7 files changed

Lines changed: 1 addition & 28 deletions

File tree

‎eng/docker-tools/templates/jobs/build-images.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ parameters:
1010
# Custom steps that run after ImageBuilder is set up but before the build starts.
1111
# Use for build-specific initialization (e.g., setting variables, additional setup).
1212
customBuildInitSteps: []
13-
# Custom steps that modify repository content before it is copied into the ImageBuilder image.
14-
customPreImageBuilderBuildSteps: []
1513
publishConfig: null
1614
versionsRepoRef: ""
1715
noCache: false
@@ -43,7 +41,6 @@ jobs:
4341
versionsRepoRef: ${{ parameters.versionsRepoRef }}
4442
cleanupDocker: true
4543
customInitSteps: ${{ parameters.customInitSteps }}
46-
customPreImageBuilderBuildSteps: ${{ parameters.customPreImageBuilderBuildSteps }}
4744
- ${{ parameters.customBuildInitSteps }}
4845
- template: /eng/docker-tools/templates/steps/reference-service-connections.yml@self
4946
parameters:

‎eng/docker-tools/templates/stages/build-and-test.yml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ parameters:
1313
# Custom steps that run after ImageBuilder is set up but before the build starts.
1414
# Use for build-specific initialization (e.g., setting variables, additional setup).
1515
customBuildInitSteps: []
16-
# Custom steps that modify repository content before it is copied into the ImageBuilder image.
17-
customPreImageBuilderBuildSteps: []
1816
customTestInitSteps: []
1917
sourceBuildPipelineRunId: ""
2018
# When true, the Post-Build stage runs even if the Build stage failed (succeededOrFailed).
@@ -115,7 +113,6 @@ stages:
115113
versionsRepoRef: ${{ parameters.versionsRepoRef }}
116114
customInitSteps: ${{ parameters.customInitSteps }}
117115
customBuildInitSteps: ${{ parameters.customBuildInitSteps }}
118-
customPreImageBuilderBuildSteps: ${{ parameters.customPreImageBuilderBuildSteps }}
119116
noCache: ${{ parameters.noCache }}
120117
publishConfig: ${{ parameters.publishConfig }}
121118
internalProjectName: ${{ parameters.internalProjectName }}
@@ -131,7 +128,6 @@ stages:
131128
versionsRepoRef: ${{ parameters.versionsRepoRef }}
132129
customInitSteps: ${{ parameters.customInitSteps }}
133130
customBuildInitSteps: ${{ parameters.customBuildInitSteps }}
134-
customPreImageBuilderBuildSteps: ${{ parameters.customPreImageBuilderBuildSteps }}
135131
noCache: ${{ parameters.noCache }}
136132
publishConfig: ${{ parameters.publishConfig }}
137133
internalProjectName: ${{ parameters.internalProjectName }}
@@ -147,7 +143,6 @@ stages:
147143
versionsRepoRef: ${{ parameters.versionsRepoRef }}
148144
customInitSteps: ${{ parameters.customInitSteps }}
149145
customBuildInitSteps: ${{ parameters.customBuildInitSteps }}
150-
customPreImageBuilderBuildSteps: ${{ parameters.customPreImageBuilderBuildSteps }}
151146
noCache: ${{ parameters.noCache }}
152147
publishConfig: ${{ parameters.publishConfig }}
153148
internalProjectName: ${{ parameters.internalProjectName }}
@@ -163,7 +158,6 @@ stages:
163158
versionsRepoRef: ${{ parameters.versionsRepoRef }}
164159
customInitSteps: ${{ parameters.customInitSteps }}
165160
customBuildInitSteps: ${{ parameters.customBuildInitSteps }}
166-
customPreImageBuilderBuildSteps: ${{ parameters.customPreImageBuilderBuildSteps }}
167161
noCache: ${{ parameters.noCache }}
168162
publishConfig: ${{ parameters.publishConfig }}
169163
internalProjectName: ${{ parameters.internalProjectName }}
@@ -179,7 +173,6 @@ stages:
179173
versionsRepoRef: ${{ parameters.versionsRepoRef }}
180174
customInitSteps: ${{ parameters.customInitSteps }}
181175
customBuildInitSteps: ${{ parameters.customBuildInitSteps }}
182-
customPreImageBuilderBuildSteps: ${{ parameters.customPreImageBuilderBuildSteps }}
183176
noCache: ${{ parameters.noCache }}
184177
publishConfig: ${{ parameters.publishConfig }}
185178
internalProjectName: ${{ parameters.internalProjectName }}
@@ -195,7 +188,6 @@ stages:
195188
versionsRepoRef: ${{ parameters.versionsRepoRef }}
196189
customInitSteps: ${{ parameters.customInitSteps }}
197190
customBuildInitSteps: ${{ parameters.customBuildInitSteps }}
198-
customPreImageBuilderBuildSteps: ${{ parameters.customPreImageBuilderBuildSteps }}
199191
noCache: ${{ parameters.noCache }}
200192
publishConfig: ${{ parameters.publishConfig }}
201193
internalProjectName: ${{ parameters.internalProjectName }}
@@ -211,7 +203,6 @@ stages:
211203
versionsRepoRef: ${{ parameters.versionsRepoRef }}
212204
customInitSteps: ${{ parameters.customInitSteps }}
213205
customBuildInitSteps: ${{ parameters.customBuildInitSteps }}
214-
customPreImageBuilderBuildSteps: ${{ parameters.customPreImageBuilderBuildSteps }}
215206
noCache: ${{ parameters.noCache }}
216207
publishConfig: ${{ parameters.publishConfig }}
217208
internalProjectName: ${{ parameters.internalProjectName }}

‎eng/docker-tools/templates/stages/dotnet/build-and-test.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ parameters:
2929
linuxArmBuildJobTimeout: 60
3030
windowsAmdBuildJobTimeout: 60
3131
customBuildInitSteps: []
32-
customPreImageBuilderBuildSteps: []
3332

3433
# Test parameters
3534
testMatrixType: platformVersionedOs
@@ -59,7 +58,6 @@ stages:
5958
testMatrixCustomBuildLegGroupArgs: ${{ parameters.testMatrixCustomBuildLegGroupArgs }}
6059
customCopyBaseImagesInitSteps: ${{ parameters.customCopyBaseImagesInitSteps}}
6160
customBuildInitSteps: ${{ parameters.customBuildInitSteps }}
62-
customPreImageBuilderBuildSteps: ${{ parameters.customPreImageBuilderBuildSteps }}
6361
customInitSteps: ${{ parameters.customInitSteps }}
6462
customTestInitSteps: ${{ parameters.customTestInitSteps }}
6563
windowsAmdBuildJobTimeout: ${{ parameters.windowsAmdBuildJobTimeout }}

‎eng/docker-tools/templates/stages/dotnet/build-test-publish-repo.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ parameters:
2121
linuxArmBuildJobTimeout: 60
2222
windowsAmdBuildJobTimeout: 60
2323
customBuildInitSteps: []
24-
customPreImageBuilderBuildSteps: []
2524

2625
# Test parameters
2726
testMatrixType: platformVersionedOs
@@ -61,7 +60,6 @@ stages:
6160
linuxArmBuildJobTimeout: ${{ parameters.linuxArmBuildJobTimeout }}
6261
windowsAmdBuildJobTimeout: ${{ parameters.windowsAmdBuildJobTimeout }}
6362
customBuildInitSteps: ${{ parameters.customBuildInitSteps }}
64-
customPreImageBuilderBuildSteps: ${{ parameters.customPreImageBuilderBuildSteps }}
6563
customInitSteps: ${{ parameters.customInitSteps }}
6664
# Test
6765
sourceBuildPipelineRunId: ${{ parameters.sourceBuildPipelineRunId }}

‎eng/docker-tools/templates/steps/init-common.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,6 @@ parameters:
3434
type: stepList
3535
default: []
3636

37-
# Custom steps that modify repository content before it is copied into the ImageBuilder image.
38-
- name: customPreImageBuilderBuildSteps
39-
type: stepList
40-
default: []
41-
4237
# Registry and authentication configuration for publishing images.
4338
# Contains server URLs, repo prefixes, subscriptions, and resource groups.
4439
# When null, build/publish steps that require registry access will be skipped.
@@ -250,4 +245,3 @@ steps:
250245
publishConfig: ${{ parameters.publishConfig }}
251246
condition: ${{ parameters.condition }}
252247
customInitSteps: ${{ parameters.customInitSteps }}
253-
customPreImageBuilderBuildSteps: ${{ parameters.customPreImageBuilderBuildSteps }}

‎eng/docker-tools/templates/steps/init-imagebuilder.yml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ parameters:
2121
type: stepList
2222
default: []
2323

24-
- name: customPreImageBuilderBuildSteps
25-
type: stepList
26-
default: []
27-
2824
steps:
2925
# Custom ImageBuilder setup (e.g., bootstrap from source)
3026
- ${{ if gt(length(parameters.customInitSteps), 0) }}:
@@ -71,7 +67,6 @@ steps:
7167
# The withrepo image layers the checked-out repository into the ImageBuilder
7268
# container at /repo, so ImageBuilder can access manifests and Dockerfiles
7369
- ${{ if eq(parameters.dockerClientOS, 'linux') }}:
74-
- ${{ parameters.customPreImageBuilderBuildSteps }}
7570
- script: >-
7671
docker build
7772
-t $(imageNames.imageBuilder.withrepo)

‎eng/docker-tools/templates/variables/docker-images.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
variables:
2-
imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder@sha256:50bbef5b6a77ef620da3f3f759a83d870ca73a53fd19e7d8c422e3717e7f97ec
2+
imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder@sha256:ebaeb7008d62ececb11335024efcddfc8cdd118b572d6784856386760af14d6d
33
imageNames.imageBuilder: $(imageNames.imageBuilderName)
44
imageNames.imageBuilder.withrepo: imagebuilder-withrepo:$(Build.BuildId)-$(System.JobId)
55
imageNames.testRunner: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux3.0-docker-testrunner

0 commit comments

Comments
 (0)