Revert "Remove rhel.6"
This reverts commit 58537a3b9f9d2bf77e85a5db7f07da38c72ce14f.
This commit is contained in:
parent
bc5f8df0f5
commit
b6eeb93ece
6 changed files with 53 additions and 0 deletions
14
.vsts-ci.yml
14
.vsts-ci.yml
|
@ -129,6 +129,13 @@ stages:
|
||||||
_RuntimeIdentifier: ''
|
_RuntimeIdentifier: ''
|
||||||
_BuildArchitecture: 'x64'
|
_BuildArchitecture: 'x64'
|
||||||
_DropSuffix: ''
|
_DropSuffix: ''
|
||||||
|
Build_Rhel_6_Debug_x64:
|
||||||
|
_BuildConfig: Debug
|
||||||
|
_DockerParameter: '--docker rhel.6'
|
||||||
|
_LinuxPortable: ''
|
||||||
|
_RuntimeIdentifier: '--runtime-id rhel.6-x64'
|
||||||
|
_BuildArchitecture: 'x64'
|
||||||
|
_DropSuffix: ''
|
||||||
Build_Arm_Debug:
|
Build_Arm_Debug:
|
||||||
_BuildConfig: Debug
|
_BuildConfig: Debug
|
||||||
_DockerParameter: ''
|
_DockerParameter: ''
|
||||||
|
@ -179,6 +186,13 @@ stages:
|
||||||
_RuntimeIdentifier: '--runtime-id linux-arm64'
|
_RuntimeIdentifier: '--runtime-id linux-arm64'
|
||||||
_BuildArchitecture: 'arm64'
|
_BuildArchitecture: 'arm64'
|
||||||
_DropSuffix: ''
|
_DropSuffix: ''
|
||||||
|
Build_Rhel_6_Release_x64:
|
||||||
|
_BuildConfig: Release
|
||||||
|
_DockerParameter: '--docker rhel.6'
|
||||||
|
_LinuxPortable: ''
|
||||||
|
_RuntimeIdentifier: '--runtime-id rhel.6-x64'
|
||||||
|
_BuildArchitecture: 'x64'
|
||||||
|
_DropSuffix: ''
|
||||||
Build_Linux_musl_Release_x64:
|
Build_Linux_musl_Release_x64:
|
||||||
_BuildConfig: Release
|
_BuildConfig: Release
|
||||||
_DockerParameter: '--docker alpine.3.6'
|
_DockerParameter: '--docker alpine.3.6'
|
||||||
|
|
34
eng/docker/rhel.6/Dockerfile
Normal file
34
eng/docker/rhel.6/Dockerfile
Normal file
|
@ -0,0 +1,34 @@
|
||||||
|
#
|
||||||
|
# Copyright (c) .NET Foundation and contributors. All rights reserved.
|
||||||
|
# Licensed under the MIT license. See LICENSE file in the project root for full license information.
|
||||||
|
#
|
||||||
|
|
||||||
|
# Dockerfile that creates a container suitable to build dotnet-cli
|
||||||
|
FROM microsoft/dotnet-buildtools-prereqs:centos-6-376e1a3-20174311014331
|
||||||
|
|
||||||
|
# yum doesn't work with the special curl version we have in the base docker image,
|
||||||
|
# so we remove /usr/local/lib from the library path for this command
|
||||||
|
RUN yum -q -y install sudo
|
||||||
|
|
||||||
|
# Setup User to match Host User, and give superuser permissions
|
||||||
|
ARG USER_ID=0
|
||||||
|
RUN useradd -m code_executor -u ${USER_ID} -g root
|
||||||
|
RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
|
||||||
|
|
||||||
|
# With the User Change, we need to change permssions on these directories
|
||||||
|
RUN chmod -R a+rwx /usr/local
|
||||||
|
RUN chmod -R a+rwx /home
|
||||||
|
RUN chmod -R 755 /usr/bin/sudo
|
||||||
|
|
||||||
|
# Set user to the one we just created
|
||||||
|
USER ${USER_ID}
|
||||||
|
|
||||||
|
# Set library path to make CURL and ICU libraries that are in /usr/local/lib visible
|
||||||
|
ENV LD_LIBRARY_PATH /usr/local/lib
|
||||||
|
|
||||||
|
# Set working directory
|
||||||
|
ARG WORK_DIR
|
||||||
|
WORKDIR ${WORK_DIR}
|
||||||
|
|
||||||
|
# Set up Azure Artifacts credential provider
|
||||||
|
RUN wget -qO- https://raw.githubusercontent.com/Microsoft/artifacts-credprovider/master/helpers/installcredprovider.sh | bash
|
|
@ -19,6 +19,7 @@
|
||||||
<Target Name="SetBadgeProps" DependsOnTargets="GetCurrentRuntimeInformation">
|
<Target Name="SetBadgeProps" DependsOnTargets="GetCurrentRuntimeInformation">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<VersionBadgeMoniker>$(OSName)_$(Architecture)</VersionBadgeMoniker>
|
<VersionBadgeMoniker>$(OSName)_$(Architecture)</VersionBadgeMoniker>
|
||||||
|
<VersionBadgeMoniker Condition=" '$(Rid)' == 'rhel.6-x64' ">rhel.6_x64</VersionBadgeMoniker>
|
||||||
<VersionBadgeMoniker Condition=" '$(Rid)' == 'linux-musl-x64' ">linux_musl_x64</VersionBadgeMoniker>
|
<VersionBadgeMoniker Condition=" '$(Rid)' == 'linux-musl-x64' ">linux_musl_x64</VersionBadgeMoniker>
|
||||||
<VersionBadgeMoniker Condition=" '$(IslinuxPortable)' == 'true' ">linux_$(Architecture)</VersionBadgeMoniker>
|
<VersionBadgeMoniker Condition=" '$(IslinuxPortable)' == 'true' ">linux_$(Architecture)</VersionBadgeMoniker>
|
||||||
<VersionBadgeMoniker Condition=" '$(IsBuildingAndPublishingAllLinuxDistrosNativeInstallers)' == 'true' ">all_linux_distros_native_installer</VersionBadgeMoniker>
|
<VersionBadgeMoniker Condition=" '$(IsBuildingAndPublishingAllLinuxDistrosNativeInstallers)' == 'true' ">all_linux_distros_native_installer</VersionBadgeMoniker>
|
||||||
|
|
|
@ -70,6 +70,7 @@
|
||||||
<CombinedFrameworkHostCompressedFileName>dotnet-runtime-$(MicrosoftNETCoreAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension)</CombinedFrameworkHostCompressedFileName>
|
<CombinedFrameworkHostCompressedFileName>dotnet-runtime-$(MicrosoftNETCoreAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension)</CombinedFrameworkHostCompressedFileName>
|
||||||
|
|
||||||
<AspNetCoreSharedFxInstallerRid Condition="'$(AspNetCoreSharedFxInstallerRid)' == ''">$(SharedFrameworkRid)</AspNetCoreSharedFxInstallerRid>
|
<AspNetCoreSharedFxInstallerRid Condition="'$(AspNetCoreSharedFxInstallerRid)' == ''">$(SharedFrameworkRid)</AspNetCoreSharedFxInstallerRid>
|
||||||
|
<AspNetCoreSharedFxInstallerRid Condition="'$(SharedFrameworkRid)' == 'rhel.6-x64'">linux-x64</AspNetCoreSharedFxInstallerRid>
|
||||||
<AspNetCoreSharedFxArchiveRid>$(AspNetCoreSharedFxInstallerRid)</AspNetCoreSharedFxArchiveRid>
|
<AspNetCoreSharedFxArchiveRid>$(AspNetCoreSharedFxInstallerRid)</AspNetCoreSharedFxArchiveRid>
|
||||||
<AspNetCoreSharedFxInstallerRid Condition="'$(InstallerExtension)' == '.deb' OR '$(InstallerExtension)' == '.rpm'">x64</AspNetCoreSharedFxInstallerRid>
|
<AspNetCoreSharedFxInstallerRid Condition="'$(InstallerExtension)' == '.deb' OR '$(InstallerExtension)' == '.rpm'">x64</AspNetCoreSharedFxInstallerRid>
|
||||||
|
|
||||||
|
|
|
@ -26,10 +26,12 @@
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<ProductMonikerRid Condition=" '$(Rid)' == 'ubuntu.16.04-x64' OR
|
<ProductMonikerRid Condition=" '$(Rid)' == 'ubuntu.16.04-x64' OR
|
||||||
|
'$(Rid)' == 'rhel.6-x64' OR
|
||||||
'$(Rid)' == 'linux-musl-x64' ">$(Rid)</ProductMonikerRid>
|
'$(Rid)' == 'linux-musl-x64' ">$(Rid)</ProductMonikerRid>
|
||||||
<ProductMonikerRid Condition=" '$(ProductMonikerRid)' == '' ">$(OSName)-$(Architecture)</ProductMonikerRid>
|
<ProductMonikerRid Condition=" '$(ProductMonikerRid)' == '' ">$(OSName)-$(Architecture)</ProductMonikerRid>
|
||||||
|
|
||||||
<HostMonikerRid Condition=" '$(HostRid)' == 'ubuntu.16.04-x64' OR
|
<HostMonikerRid Condition=" '$(HostRid)' == 'ubuntu.16.04-x64' OR
|
||||||
|
'$(HostRid)' == 'rhel.6-x64' OR
|
||||||
'$(HostRid)' == 'linux-musl-x64' ">$(HostRid)</HostMonikerRid>
|
'$(HostRid)' == 'linux-musl-x64' ">$(HostRid)</HostMonikerRid>
|
||||||
<HostMonikerRid Condition=" '$(HostMonikerRid)' == '' ">$(HostOSName)-$(Architecture)</HostMonikerRid>
|
<HostMonikerRid Condition=" '$(HostMonikerRid)' == '' ">$(HostOSName)-$(Architecture)</HostMonikerRid>
|
||||||
<HostMonikerRidForFileName>$(HostMonikerRid)</HostMonikerRidForFileName>
|
<HostMonikerRidForFileName>$(HostMonikerRid)</HostMonikerRidForFileName>
|
||||||
|
|
|
@ -15,6 +15,7 @@
|
||||||
<UsePortableLinuxSharedFramework Condition=" '$(UsePortableLinuxSharedFramework)' == '' AND '$(OSPlatform)' == 'linux' AND '$(Rid)' != 'rhel.6-x64' AND '$(Rid)' != 'linux-musl-x64' ">true</UsePortableLinuxSharedFramework>
|
<UsePortableLinuxSharedFramework Condition=" '$(UsePortableLinuxSharedFramework)' == '' AND '$(OSPlatform)' == 'linux' AND '$(Rid)' != 'rhel.6-x64' AND '$(Rid)' != 'linux-musl-x64' ">true</UsePortableLinuxSharedFramework>
|
||||||
<!--<IncludeSharedFrameworksForBackwardsCompatibilityTests Condition=" $(IncludeSharedFrameworksForBackwardsCompatibilityTests) == ''
|
<!--<IncludeSharedFrameworksForBackwardsCompatibilityTests Condition=" $(IncludeSharedFrameworksForBackwardsCompatibilityTests) == ''
|
||||||
AND '$(Rid)' != 'linux-x64'
|
AND '$(Rid)' != 'linux-x64'
|
||||||
|
AND '$(Rid)' != 'rhel.6-x64'
|
||||||
AND '$(Rid)' != 'linux-musl-x64'
|
AND '$(Rid)' != 'linux-musl-x64'
|
||||||
AND '$(Rid)' != 'ubuntu.18.04-x64'">true</IncludeSharedFrameworksForBackwardsCompatibilityTests>-->
|
AND '$(Rid)' != 'ubuntu.18.04-x64'">true</IncludeSharedFrameworksForBackwardsCompatibilityTests>-->
|
||||||
<HighEntropyVA>true</HighEntropyVA>
|
<HighEntropyVA>true</HighEntropyVA>
|
||||||
|
|
Loading…
Reference in a new issue