mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #14198 from dotnet/v-wuzhai/UpdateFedora

Browse source 
Update fedora docker image tag to latest one
This commit is contained in:
Marc Paine 2022-08-02 12:50:11 -07:00 committed by GitHub
commit 3faa96e7bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.vsts-ci.yml
View file

@ -153,9 +153,9 @@ stages:
_RuntimeIdentifier: '' _RuntimeIdentifier: ''
_BuildArchitecture: 'x64' _BuildArchitecture: 'x64'
_TestArg: $(_NonWindowsTestArg) _TestArg: $(_NonWindowsTestArg)
Build_Fedora_29_Debug_x64: Build_Fedora_36_Debug_x64:
_BuildConfig: Debug _BuildConfig: Debug
_DockerParameter: '--docker fedora.29' _DockerParameter: '--docker fedora.36'
_LinuxPortable: '--linux-portable' _LinuxPortable: '--linux-portable'
_RuntimeIdentifier: '' _RuntimeIdentifier: ''
_BuildArchitecture: 'x64' _BuildArchitecture: 'x64'

4
eng/docker/fedora.29/Dockerfile → eng/docker/fedora.36/Dockerfile
View file

@ -4,14 +4,14 @@
# #
# Dockerfile that creates a container suitable to build dotnet-cli # Dockerfile that creates a container suitable to build dotnet-cli
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-29-2f0798a-20181105183801 FROM mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-36-20220716171953-531d246
RUN dnf install -y nss RUN dnf install -y nss
RUN dnf clean all RUN dnf clean all
# Override RID set by the dotnet-buildtools-prereqs docker image # Override RID set by the dotnet-buildtools-prereqs docker image
ENV __PUBLISH_RID=fedora.29-x64 ENV __PUBLISH_RID=fedora.36-x64
# Setup User to match Host User, and give superuser permissions # Setup User to match Host User, and give superuser permissions
ARG USER_ID=0 ARG USER_ID=0