diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 6748aa26d..094e31178 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -129,6 +129,13 @@ stages: _RuntimeIdentifier: '' _BuildArchitecture: 'x64' _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: _BuildConfig: Debug _DockerParameter: '' @@ -179,6 +186,13 @@ stages: _RuntimeIdentifier: '--runtime-id linux-arm64' _BuildArchitecture: 'arm64' _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: _BuildConfig: Release _DockerParameter: '--docker alpine.3.6' diff --git a/eng/docker/rhel.6/Dockerfile b/eng/docker/rhel.6/Dockerfile new file mode 100644 index 000000000..9e2e572d0 --- /dev/null +++ b/eng/docker/rhel.6/Dockerfile @@ -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 diff --git a/src/redist/targets/Badge.targets b/src/redist/targets/Badge.targets index f7416fef7..8e9ccc4ac 100644 --- a/src/redist/targets/Badge.targets +++ b/src/redist/targets/Badge.targets @@ -19,6 +19,7 @@ $(OSName)_$(Architecture) + rhel.6_x64 linux_musl_x64 linux_$(Architecture) all_linux_distros_native_installer diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index d8f36a72e..e595067aa 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -70,6 +70,7 @@ dotnet-runtime-$(MicrosoftNETCoreAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) $(SharedFrameworkRid) + linux-x64 $(AspNetCoreSharedFxInstallerRid) x64 diff --git a/src/redist/targets/GetRuntimeInformation.targets b/src/redist/targets/GetRuntimeInformation.targets index 695a56908..bdc42db26 100644 --- a/src/redist/targets/GetRuntimeInformation.targets +++ b/src/redist/targets/GetRuntimeInformation.targets @@ -26,10 +26,12 @@ $(Rid) $(OSName)-$(Architecture) $(HostRid) $(HostOSName)-$(Architecture) $(HostMonikerRid) diff --git a/src/redist/targets/SetBuildDefaults.targets b/src/redist/targets/SetBuildDefaults.targets index 268100720..52d64447a 100644 --- a/src/redist/targets/SetBuildDefaults.targets +++ b/src/redist/targets/SetBuildDefaults.targets @@ -15,6 +15,7 @@ true true