Skip to content

Use Ubuntu host image #836

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Use Ubuntu host image #836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e2a7b9b
Use Ubuntu host image
anamnavi Nov 4, 2024
5fc893c
disable git lfs when checking out powershell-docker repo
anamnavi Nov 4, 2024
6fc2daf
host image of mariner is fine for release
anamnavi Nov 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .pipelines/PowerShell-Docker-Image-Build-Official.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ variables:
- name: DisableDockerDetector
value: true
- name: LinuxContainerImage
value: mcr.microsoft.com/onebranch/cbl-mariner/build:2.0
value: onebranch.azurecr.io/linux/ubuntu-2004:latest
- name: WindowsContainerImage
value: onebranch.azurecr.io/windows/ltsc2019/vse2022:latest
- name: ob_sdl_sbom_enabled
Expand All @@ -42,6 +42,10 @@ extends:
parameters:
featureFlags:
runHostSDL: true
# Work around regression in OneBranch docker builds
needExceptionForUbuntuUsage: true
LinuxHostVersion:
Distribution: Ubuntu
customTags: 'ES365AIMigrationTooling-BulkMigrated'
stages:
- stage: StageResolveVersionandYaml
Expand Down
3 changes: 3 additions & 0 deletions .pipelines/PowerShell-Docker-Image-Release-Official.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,9 @@ extends:
demands:
- ImageOverride -equals PSMMSUbuntu20.04-Secure-120GB
steps:
- checkout: self
clean: true
lfs: false
- task: DownloadPipelineArtifact@2
inputs:
targetPath: $(Pipeline.Workspace)
Expand Down
6 changes: 0 additions & 6 deletions .vsts-ci/releaseJob.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,12 +128,6 @@ jobs:
targetPath: $(Build.SourcesDirectory)/dst/$(dockerBuildImageName)
artifact: drop_StageGenerateBuild_${{ parameters.channel }}_Job_PreBuild_${{ parameters.archName }}_${{ parameters.artifactSuffix }}
displayName: 'Download artifact to which Dockerfile was uploaded'
- task: onebranch.pipeline.containercontrol@1
displayName: "Login to source ACR"
inputs:
command: login
acr_name: $(ACRName)
tenant: MSFT
- task: onebranch.pipeline.imagebuildinfo@1
displayName: image build
inputs:
Expand Down
Loading