From 1d4a1b192ed814cf28512d86196704e49faa846a Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Thu, 29 Aug 2024 11:13:04 -0700 Subject: [PATCH 1/8] Update branding to 6.0.135 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 4a792cc04..0c5a71199 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 1 - 34 + 35 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 0f6f164ab829e4c4b5a043eb4c0f38226125253e Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 30 Aug 2024 14:16:54 -0700 Subject: [PATCH 2/8] Update .vsts-pr.yml for centos --- .vsts-pr.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.vsts-pr.yml b/.vsts-pr.yml index 2222ff644..99b666f02 100644 --- a/.vsts-pr.yml +++ b/.vsts-pr.yml @@ -175,16 +175,16 @@ stages: _BuildArchitecture: 'x64' _AdditionalBuildParameters: '/p:BuildSdkDeb=true' _TestArg: $(_NonWindowsTestArg) - Build_Rhel_7_2_Release_x64: + Build_CentOS_7_2_Release_x64: _BuildConfig: Release - _DockerParameter: '--docker rhel' + _DockerParameter: '--docker centos' _LinuxPortable: '' _RuntimeIdentifier: '' _BuildArchitecture: 'x64' _TestArg: $(_NonWindowsTestArg) - Build_Rhel_7_2_Release_Arm64: + Build_CentOS_7_2_Release_Arm64: _BuildConfig: Release - _DockerParameter: '--docker rhel' + _DockerParameter: '--docker centos' _LinuxPortable: '' _RuntimeIdentifier: '--runtime-id linux-arm64' _BuildArchitecture: 'arm64' @@ -291,7 +291,7 @@ stages: _TestArg: $(_NonWindowsTestArg) Build_Linux_Portable_Rpm_Release_x64: _BuildConfig: Release - _DockerParameter: '--docker rhel' + _DockerParameter: '--docker centos' _LinuxPortable: '--linux-portable' _RuntimeIdentifier: '' _BuildArchitecture: 'x64' @@ -301,7 +301,7 @@ stages: _TestArg: $(_NonWindowsTestArg) Build_Linux_Portable_Rpm_Release_Arm64: _BuildConfig: Release - _DockerParameter: '--docker rhel' + _DockerParameter: '--docker centos' _LinuxPortable: '--linux-portable' _RuntimeIdentifier: '--runtime-id linux-arm64' _BuildArchitecture: 'arm64' From c49adcf408612230d8c51944ee53ce12f30ea782 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 30 Aug 2024 14:17:25 -0700 Subject: [PATCH 3/8] Update .vsts-ci.yml for centos --- .vsts-ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 66492d6dc..6ad84103f 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -219,16 +219,16 @@ extends: _BuildArchitecture: 'x64' _AdditionalBuildParameters: '/p:BuildSdkDeb=true' _TestArg: $(_NonWindowsTestArg) - Build_Rhel_7_2_Release_x64: + Build_CentOS_7_2_Release_x64: _BuildConfig: Release - _DockerParameter: '--docker rhel' + _DockerParameter: '--docker centos' _LinuxPortable: '' _RuntimeIdentifier: '' _BuildArchitecture: 'x64' _TestArg: $(_NonWindowsTestArg) - Build_Rhel_7_2_Release_Arm64: + Build_CentOS_7_2_Release_Arm64: _BuildConfig: Release - _DockerParameter: '--docker rhel' + _DockerParameter: '--docker centos' _LinuxPortable: '' _RuntimeIdentifier: '--runtime-id linux-arm64' _BuildArchitecture: 'arm64' @@ -335,7 +335,7 @@ extends: _TestArg: $(_NonWindowsTestArg) Build_Linux_Portable_Rpm_Release_x64: _BuildConfig: Release - _DockerParameter: '--docker rhel' + _DockerParameter: '--docker centos' _LinuxPortable: '--linux-portable' _RuntimeIdentifier: '' _BuildArchitecture: 'x64' @@ -345,7 +345,7 @@ extends: _TestArg: $(_NonWindowsTestArg) Build_Linux_Portable_Rpm_Release_Arm64: _BuildConfig: Release - _DockerParameter: '--docker rhel' + _DockerParameter: '--docker centos' _LinuxPortable: '--linux-portable' _RuntimeIdentifier: '--runtime-id linux-arm64' _BuildArchitecture: 'arm64' From 711cb729d878e4d85335e6f27a31296eb2452ea8 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Fri, 30 Aug 2024 14:21:41 -0700 Subject: [PATCH 4/8] Use floating centos tag and remove EOL RHEL Dockerfile --- eng/docker/centos/Dockerfile | 2 +- eng/docker/rhel/Dockerfile | 27 --------------------------- 2 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 eng/docker/rhel/Dockerfile diff --git a/eng/docker/centos/Dockerfile b/eng/docker/centos/Dockerfile index 0627f84d8..d341147e7 100644 --- a/eng/docker/centos/Dockerfile +++ b/eng/docker/centos/Dockerfile @@ -4,7 +4,7 @@ # # Dockerfile that creates a container suitable to build dotnet-cli -FROM mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-b46d863-20180719033416 +FROM mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7 RUN yum -q -y install sudo diff --git a/eng/docker/rhel/Dockerfile b/eng/docker/rhel/Dockerfile deleted file mode 100644 index c629cbf0a..000000000 --- a/eng/docker/rhel/Dockerfile +++ /dev/null @@ -1,27 +0,0 @@ -# -# 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 mcr.microsoft.com/dotnet-buildtools/prereqs:rhel-7-rpmpkg-e1b4a89-20175311035359 - -# 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 permissions on these directories -RUN chmod -R a+rwx /usr/local -RUN chmod -R a+rwx /home -RUN chown root:root /usr/bin/sudo && chmod 4755 /usr/bin/sudo - -# Set user to the one we just created -USER ${USER_ID} - -# 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 From a02a34dbecff32512c2498c1fb634a1c1a20917a Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Tue, 3 Sep 2024 11:04:51 -0500 Subject: [PATCH 5/8] Revert "Update .vsts-pr.yml for centos" This reverts commit 0f6f164ab829e4c4b5a043eb4c0f38226125253e. --- .vsts-pr.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.vsts-pr.yml b/.vsts-pr.yml index 99b666f02..2222ff644 100644 --- a/.vsts-pr.yml +++ b/.vsts-pr.yml @@ -175,16 +175,16 @@ stages: _BuildArchitecture: 'x64' _AdditionalBuildParameters: '/p:BuildSdkDeb=true' _TestArg: $(_NonWindowsTestArg) - Build_CentOS_7_2_Release_x64: + Build_Rhel_7_2_Release_x64: _BuildConfig: Release - _DockerParameter: '--docker centos' + _DockerParameter: '--docker rhel' _LinuxPortable: '' _RuntimeIdentifier: '' _BuildArchitecture: 'x64' _TestArg: $(_NonWindowsTestArg) - Build_CentOS_7_2_Release_Arm64: + Build_Rhel_7_2_Release_Arm64: _BuildConfig: Release - _DockerParameter: '--docker centos' + _DockerParameter: '--docker rhel' _LinuxPortable: '' _RuntimeIdentifier: '--runtime-id linux-arm64' _BuildArchitecture: 'arm64' @@ -291,7 +291,7 @@ stages: _TestArg: $(_NonWindowsTestArg) Build_Linux_Portable_Rpm_Release_x64: _BuildConfig: Release - _DockerParameter: '--docker centos' + _DockerParameter: '--docker rhel' _LinuxPortable: '--linux-portable' _RuntimeIdentifier: '' _BuildArchitecture: 'x64' @@ -301,7 +301,7 @@ stages: _TestArg: $(_NonWindowsTestArg) Build_Linux_Portable_Rpm_Release_Arm64: _BuildConfig: Release - _DockerParameter: '--docker centos' + _DockerParameter: '--docker rhel' _LinuxPortable: '--linux-portable' _RuntimeIdentifier: '--runtime-id linux-arm64' _BuildArchitecture: 'arm64' From 3791940deafef69b934e5bf46e325335a18ca55d Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Tue, 3 Sep 2024 11:05:01 -0500 Subject: [PATCH 6/8] Revert "Update .vsts-ci.yml for centos" This reverts commit c49adcf408612230d8c51944ee53ce12f30ea782. --- .vsts-ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 6ad84103f..66492d6dc 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -219,16 +219,16 @@ extends: _BuildArchitecture: 'x64' _AdditionalBuildParameters: '/p:BuildSdkDeb=true' _TestArg: $(_NonWindowsTestArg) - Build_CentOS_7_2_Release_x64: + Build_Rhel_7_2_Release_x64: _BuildConfig: Release - _DockerParameter: '--docker centos' + _DockerParameter: '--docker rhel' _LinuxPortable: '' _RuntimeIdentifier: '' _BuildArchitecture: 'x64' _TestArg: $(_NonWindowsTestArg) - Build_CentOS_7_2_Release_Arm64: + Build_Rhel_7_2_Release_Arm64: _BuildConfig: Release - _DockerParameter: '--docker centos' + _DockerParameter: '--docker rhel' _LinuxPortable: '' _RuntimeIdentifier: '--runtime-id linux-arm64' _BuildArchitecture: 'arm64' @@ -335,7 +335,7 @@ extends: _TestArg: $(_NonWindowsTestArg) Build_Linux_Portable_Rpm_Release_x64: _BuildConfig: Release - _DockerParameter: '--docker centos' + _DockerParameter: '--docker rhel' _LinuxPortable: '--linux-portable' _RuntimeIdentifier: '' _BuildArchitecture: 'x64' @@ -345,7 +345,7 @@ extends: _TestArg: $(_NonWindowsTestArg) Build_Linux_Portable_Rpm_Release_Arm64: _BuildConfig: Release - _DockerParameter: '--docker centos' + _DockerParameter: '--docker rhel' _LinuxPortable: '--linux-portable' _RuntimeIdentifier: '--runtime-id linux-arm64' _BuildArchitecture: 'arm64' From b42cbaa0aef98b9d9c4f0267097e0c2c8e924cc1 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Tue, 3 Sep 2024 11:05:06 -0500 Subject: [PATCH 7/8] Revert "Use floating centos tag and remove EOL RHEL Dockerfile" This reverts commit 711cb729d878e4d85335e6f27a31296eb2452ea8. --- eng/docker/centos/Dockerfile | 2 +- eng/docker/rhel/Dockerfile | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 eng/docker/rhel/Dockerfile diff --git a/eng/docker/centos/Dockerfile b/eng/docker/centos/Dockerfile index d341147e7..0627f84d8 100644 --- a/eng/docker/centos/Dockerfile +++ b/eng/docker/centos/Dockerfile @@ -4,7 +4,7 @@ # # Dockerfile that creates a container suitable to build dotnet-cli -FROM mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7 +FROM mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-b46d863-20180719033416 RUN yum -q -y install sudo diff --git a/eng/docker/rhel/Dockerfile b/eng/docker/rhel/Dockerfile new file mode 100644 index 000000000..c629cbf0a --- /dev/null +++ b/eng/docker/rhel/Dockerfile @@ -0,0 +1,27 @@ +# +# 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 mcr.microsoft.com/dotnet-buildtools/prereqs:rhel-7-rpmpkg-e1b4a89-20175311035359 + +# 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 permissions on these directories +RUN chmod -R a+rwx /usr/local +RUN chmod -R a+rwx /home +RUN chown root:root /usr/bin/sudo && chmod 4755 /usr/bin/sudo + +# Set user to the one we just created +USER ${USER_ID} + +# 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 From 52794bd1aff9df48797bb23e3620ce44f31568f9 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Tue, 3 Sep 2024 11:05:51 -0500 Subject: [PATCH 8/8] try different rhel tag --- eng/docker/rhel/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/docker/rhel/Dockerfile b/eng/docker/rhel/Dockerfile index c629cbf0a..202025488 100644 --- a/eng/docker/rhel/Dockerfile +++ b/eng/docker/rhel/Dockerfile @@ -4,7 +4,7 @@ # # Dockerfile that creates a container suitable to build dotnet-cli -FROM mcr.microsoft.com/dotnet-buildtools/prereqs:rhel-7-rpmpkg-e1b4a89-20175311035359 +FROM mcr.microsoft.com/dotnet-buildtools/prereqs:rhel-7-rpmpkg-e1b4a89-20175311035359-2 # Setup User to match Host User, and give superuser permissions ARG USER_ID=0