Skip to content

Commit 0845825

Browse files
committed
Update node
1 parent e364183 commit 0845825

File tree

4 files changed

+152
-192
lines changed

4 files changed

+152
-192
lines changed

vsts/pipelines/baseImages/dotnetcore.yml

Lines changed: 56 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -8,47 +8,60 @@ variables:
88
value: true
99
- name: Packaging.EnableSBOMSigning
1010
value: true
11-
12-
jobs:
13-
- template: ../templates/_buildimageBasesJobTemplate.yml
11+
resources:
12+
repositories:
13+
- repository: 1ESPipelineTemplates
14+
type: git
15+
name: 1ESPipelineTemplates/1ESPipelineTemplates
16+
ref: refs/tags/release
17+
extends:
18+
template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
1419
parameters:
15-
displayName: Build DotNetCore runtime buster base images
16-
scriptPath: ./build/buildRunTimeImageBases.sh
17-
imageDir: dotnetcore
18-
imageDebianFlavor: buster
19-
artifactsFileName: dotnetcore-runtimeimage-bases-buster.txt
20-
jobName: Build_DotNetCore_BaseImage_Buster
21-
22-
- template: ../templates/_buildimageBasesJobTemplate.yml
23-
parameters:
24-
displayName: Build DotNetCore runtime bullseye base images
25-
scriptPath: ./build/buildRunTimeImageBases.sh
26-
imageDir: dotnetcore
27-
imageDebianFlavor: bullseye
28-
artifactsFileName: dotnetcore-runtimeimage-bases-bullseye.txt
29-
jobName: Build_DotNetCore_BaseImage_Bullseye
30-
31-
- template: ../templates/_buildimageBasesJobTemplate.yml
32-
parameters:
33-
displayName: Build DotNetCore runtime bookworm base images
34-
scriptPath: ./build/buildRunTimeImageBases.sh
35-
imageDir: dotnetcore
36-
imageDebianFlavor: bookworm
37-
artifactsFileName: dotnetcore-runtimeimage-bases-bookworm.txt
38-
jobName: Build_DotNetCore_BaseImage_Bookworm
39-
40-
- job: Release_DotNetCoreRuntimeBaseImage
41-
dependsOn:
42-
- Build_DotNetCore_BaseImage_Buster
43-
- Build_DotNetCore_BaseImage_Bullseye
44-
- Build_DotNetCore_BaseImage_Bookworm
45-
displayName: Push images to MCR
46-
timeoutInMinutes: 250
47-
pool:
48-
name: AzurePipelines-EO
49-
demands:
50-
- ImageOverride -equals AzurePipelinesUbuntu20.04compliant
51-
steps:
52-
- template: ../templates/_releaseBaseImagesStepTemplate.yml
53-
parameters:
54-
baseImageName: 'dotnetcore'
20+
pool:
21+
name: AzurePipelines-EO
22+
image: AzurePipelinesUbuntu20.04compliant
23+
os: linux
24+
sdl:
25+
sourceAnalysisPool:
26+
name: AzurePipelines-EO
27+
os: windows
28+
customBuildTags:
29+
- ES365AIMigrationTooling-BulkMigrated
30+
stages:
31+
- stage: stage
32+
jobs:
33+
- template: /vsts/pipelines/templates/_buildimageBasesJobTemplate.yml@self
34+
parameters:
35+
displayName: Build DotNetCore runtime buster base images
36+
scriptPath: ./build/buildRunTimeImageBases.sh
37+
imageDir: dotnetcore
38+
imageDebianFlavor: buster
39+
artifactsFileName: dotnetcore-runtimeimage-bases-buster.txt
40+
jobName: Build_DotNetCore_BaseImage_Buster
41+
- template: /vsts/pipelines/templates/_buildimageBasesJobTemplate.yml@self
42+
parameters:
43+
displayName: Build DotNetCore runtime bullseye base images
44+
scriptPath: ./build/buildRunTimeImageBases.sh
45+
imageDir: dotnetcore
46+
imageDebianFlavor: bullseye
47+
artifactsFileName: dotnetcore-runtimeimage-bases-bullseye.txt
48+
jobName: Build_DotNetCore_BaseImage_Bullseye
49+
- template: /vsts/pipelines/templates/_buildimageBasesJobTemplate.yml@self
50+
parameters:
51+
displayName: Build DotNetCore runtime bookworm base images
52+
scriptPath: ./build/buildRunTimeImageBases.sh
53+
imageDir: dotnetcore
54+
imageDebianFlavor: bookworm
55+
artifactsFileName: dotnetcore-runtimeimage-bases-bookworm.txt
56+
jobName: Build_DotNetCore_BaseImage_Bookworm
57+
- job: Release_DotNetCoreRuntimeBaseImage
58+
dependsOn:
59+
- Build_DotNetCore_BaseImage_Buster
60+
- Build_DotNetCore_BaseImage_Bullseye
61+
- Build_DotNetCore_BaseImage_Bookworm
62+
displayName: Push images to MCR
63+
timeoutInMinutes: 250
64+
steps:
65+
- template: /vsts/pipelines/templates/_releaseBaseImagesStepTemplate.yml@self
66+
parameters:
67+
baseImageName: 'dotnetcore'

vsts/pipelines/baseImages/node.yml

Lines changed: 54 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -8,45 +8,58 @@ variables:
88
value: true
99
- name: Packaging.EnableSBOMSigning
1010
value: true
11-
12-
jobs:
13-
- template: ../templates/_buildimageBasesJobTemplate.yml
11+
resources:
12+
repositories:
13+
- repository: 1ESPipelineTemplates
14+
type: git
15+
name: 1ESPipelineTemplates/1ESPipelineTemplates
16+
ref: refs/tags/release
17+
extends:
18+
template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
1419
parameters:
15-
displayName: Build Node runtime buster based images
16-
scriptPath: ./build/buildRunTimeImageBases.sh
17-
imageDir: node
18-
imageDebianFlavor: buster
19-
artifactsFileName: node-runtimeimage-bases-buster.txt
20-
jobName: Build_Buster_BaseImages
21-
22-
- template: ../templates/_buildimageBasesJobTemplate.yml
23-
parameters:
24-
displayName: Build Node runtime bullseye base images
25-
scriptPath: ./build/buildRunTimeImageBases.sh
26-
imageDir: node
27-
imageDebianFlavor: bullseye
28-
artifactsFileName: node-runtimeimage-bases-bullseye.txt
29-
jobName: Build_Bullseye_BaseImages
30-
31-
- template: ../templates/_buildimageBasesJobTemplate.yml
32-
parameters:
33-
displayName: Build Node runtime bookworm base images
34-
scriptPath: ./build/buildRunTimeImageBases.sh
35-
imageDir: node
36-
imageDebianFlavor: bookworm
37-
artifactsFileName: node-runtimeimage-bases-bookworm.txt
38-
jobName: Build_Bookworm_BaseImages
39-
40-
- job: Release_NodeRuntimeBaseImage
41-
dependsOn:
42-
- Build_Buster_BaseImages
43-
displayName: Push images to MCR
44-
timeoutInMinutes: 250
45-
pool:
46-
name: AzurePipelines-EO
47-
demands:
48-
- ImageOverride -equals AzurePipelinesUbuntu20.04compliant
49-
steps:
50-
- template: ../templates/_releaseBaseImagesStepTemplate.yml
51-
parameters:
52-
baseImageName: 'node'
20+
pool:
21+
name: AzurePipelines-EO
22+
image: AzurePipelinesUbuntu20.04compliant
23+
os: linux
24+
sdl:
25+
sourceAnalysisPool:
26+
name: AzurePipelines-EO
27+
os: windows
28+
customBuildTags:
29+
- ES365AIMigrationTooling-BulkMigrated
30+
stages:
31+
- stage: stage
32+
jobs:
33+
- template: /vsts/pipelines/templates/_buildimageBasesJobTemplate.yml@self
34+
parameters:
35+
displayName: Build Node runtime buster based images
36+
scriptPath: ./build/buildRunTimeImageBases.sh
37+
imageDir: node
38+
imageDebianFlavor: buster
39+
artifactsFileName: node-runtimeimage-bases-buster.txt
40+
jobName: Build_Buster_BaseImages
41+
- template: /vsts/pipelines/templates/_buildimageBasesJobTemplate.yml@self
42+
parameters:
43+
displayName: Build Node runtime bullseye base images
44+
scriptPath: ./build/buildRunTimeImageBases.sh
45+
imageDir: node
46+
imageDebianFlavor: bullseye
47+
artifactsFileName: node-runtimeimage-bases-bullseye.txt
48+
jobName: Build_Bullseye_BaseImages
49+
- template: /vsts/pipelines/templates/_buildimageBasesJobTemplate.yml@self
50+
parameters:
51+
displayName: Build Node runtime bookworm base images
52+
scriptPath: ./build/buildRunTimeImageBases.sh
53+
imageDir: node
54+
imageDebianFlavor: bookworm
55+
artifactsFileName: node-runtimeimage-bases-bookworm.txt
56+
jobName: Build_Bookworm_BaseImages
57+
- job: Release_NodeRuntimeBaseImage
58+
dependsOn:
59+
- Build_Buster_BaseImages
60+
displayName: Push images to MCR
61+
timeoutInMinutes: 250
62+
steps:
63+
- template: /vsts/pipelines/templates/_releaseBaseImagesStepTemplate.yml@self
64+
parameters:
65+
baseImageName: 'node'
Lines changed: 40 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,40 @@
1-
# trigger: none
2-
3-
# The `resources` specify the location and version of the 1ES PT.
4-
resources:
5-
repositories:
6-
- repository: 1esPipelines
7-
type: git
8-
name: 1ESPipelineTemplates/1ESPipelineTemplates
9-
ref: refs/tags/release
10-
11-
extends:
12-
# The pipeline extends the 1ES PT which will inject different SDL and compliance tasks.
13-
# For non-production pipelines, use "Unofficial" as defined below.
14-
# For productions pipelines, use "Official".
15-
template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
16-
parameters:
17-
# Update the pool with your team's 1ES hosted pool.
18-
pool:
19-
name: AzurePipelines-EO
20-
image: AzurePipelinesUbuntu20.04compliant # Name of the image in your pool. If not specified, first image of the pool is used
21-
os: linux # OS of the image. Allowed values: windows, linux, macOS
22-
23-
stages:
24-
- stage: Stage
25-
jobs:
26-
- job: HostJob
27-
timeoutInMinutes: 250
28-
# If the pipeline publishes artifacts, use `templateContext` to define the artifacts.
29-
# This will enable 1ES PT to run SDL analysis tools on the artifacts and then upload them.
30-
templateContext:
31-
outputs:
32-
- output: pipelineArtifact
33-
targetPath: $(Build.ArtifactStagingDirectory)
34-
artifactName: buildImageBasesJobArtifact
35-
# Define the steps that the pipeline will run.
36-
# In most cases, copy and paste the steps from the original pipeline.
37-
steps:
38-
- task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
39-
displayName: 'Component Detection - OSS Compliance'
40-
inputs:
41-
ignoreDirectories: '$(Build.SourcesDirectory)/tests'
42-
43-
- task: ShellScript@2
44-
displayName: Build images
45-
inputs:
46-
scriptPath: ${{ parameters.scriptPath }}
47-
args: ${{ parameters.imageDir }} ${{ parameters.imageDebianFlavor }}
48-
env:
49-
ORYX_SDK_STORAGE_ACCOUNT_ACCESS_TOKEN: $(ORYX-SDK-STAGING-PRIVATE-SAS-TOKEN)
50-
DOTNET_PRIVATE_STORAGE_ACCOUNT_ACCESS_TOKEN: $(DotnetPrivateStorageAccountAccessToken)
51-
52-
- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
53-
displayName: Generate Software Bill of Materials (SBOM)
54-
inputs:
55-
BuildDropPath: '$(Build.ArtifactStagingDirectory)'
56-
AdditionalComponentDetectorArgs: '--DirectoryExclusionList **/SampleApps/**'
57-
58-
- task: CopyFiles@2
59-
displayName: Copy artifacts to staging directory
60-
inputs:
61-
sourceFolder: '$(Build.SourcesDirectory)/artifacts'
62-
contents: '**/*.*'
63-
targetFolder: $(Build.ArtifactStagingDirectory)
64-
overWrite: true
65-
condition: true
66-
67-
- task: Docker@1
68-
displayName: Push built base images to dev ACR
69-
inputs:
70-
command: push
71-
azureSubscriptionEndpoint: $(ascName)
72-
azureContainerRegistry: $(acrName)
73-
pushMultipleImages: true
74-
imageNamesPath: '$(Build.ArtifactStagingDirectory)/images/${{ parameters.artifactsFileName }}'
75-
enforceDockerNamingConvention: false
76-
77-
- task: ShellScript@2
78-
displayName: 'Clean up Docker containers and images'
79-
inputs:
80-
scriptPath: ./vsts/scripts/cleanDocker.sh
81-
82-
- task: PublishBuildArtifacts@1
83-
displayName: Publish build artifacts
84-
inputs:
85-
pathtoPublish: $(Build.ArtifactStagingDirectory)
86-
87-
- task: ShellScript@2
88-
displayName: 'Clean up Docker containers and images'
89-
inputs:
90-
scriptPath: ./vsts/scripts/cleanDocker.sh
91-
condition: true
1+
jobs:
2+
- job: ${{ parameters.jobName }}
3+
displayName: ${{ parameters.displayName }}
4+
timeoutInMinutes: 250
5+
templateContext:
6+
outputs:
7+
- output: pipelineArtifact
8+
displayName: 'Publish build artifacts'
9+
targetPath: $(Build.ArtifactStagingDirectory)
10+
steps:
11+
- task: ShellScript@2
12+
displayName: Build images
13+
inputs:
14+
scriptPath: ${{ parameters.scriptPath }}
15+
args: ${{ parameters.imageDir }} ${{ parameters.imageDebianFlavor }}
16+
env:
17+
ORYX_SDK_STORAGE_ACCOUNT_ACCESS_TOKEN: $(ORYX-SDK-STAGING-PRIVATE-SAS-TOKEN)
18+
DOTNET_PRIVATE_STORAGE_ACCOUNT_ACCESS_TOKEN: $(DotnetPrivateStorageAccountAccessToken)
19+
- task: CopyFiles@2
20+
displayName: Copy artifacts to staging directory
21+
inputs:
22+
sourceFolder: '$(Build.SourcesDirectory)/artifacts'
23+
contents: '**/*.*'
24+
targetFolder: $(Build.ArtifactStagingDirectory)
25+
overWrite: true
26+
condition: true
27+
- task: 1ES.PushContainerImage@1
28+
displayName: Push built base images to dev ACR
29+
inputs:
30+
image: '$(Build.ArtifactStagingDirectory)/images/${{ parameters.artifactsFileName }}'
31+
remoteImage: $(acrname)/$(Build.ArtifactStagingDirectory)/images/${{ parameters.artifactsFileName }}
32+
- task: ShellScript@2
33+
displayName: 'Clean up Docker containers and images'
34+
inputs:
35+
scriptPath: ./vsts/scripts/cleanDocker.sh
36+
- task: ShellScript@2
37+
displayName: 'Clean up Docker containers and images'
38+
inputs:
39+
scriptPath: ./vsts/scripts/cleanDocker.sh
40+
condition: true

0 commit comments

Comments
 (0)