From 5587b608b02535231e258b7019ab740098dd07c9 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Thu, 14 Apr 2022 13:09:06 -0700 Subject: [PATCH 1/4] Try new image --- eng/docker/rhel.Dockerfile | 11 +---------- src/Installers/Rpm/Directory.Build.targets | 2 +- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/eng/docker/rhel.Dockerfile b/eng/docker/rhel.Dockerfile index 61d42539e8f4..3171723ed906 100644 --- a/eng/docker/rhel.Dockerfile +++ b/eng/docker/rhel.Dockerfile @@ -1,5 +1,5 @@ # Dockerfile that creates a container suitable to build dotnet-cli -FROM mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-rpmpkg-20210714125435-9b5bbc2 +FROM mcr.microsoft.com/dotnet-buildtools/prereqs:rhel-7-rpmpkg-c982313-20174116044113 # Setup User to match Host User, and give superuser permissions ARG USER @@ -9,15 +9,6 @@ ARG WORKDIR WORKDIR ${WORKDIR} -# Workaround per https://github.com/dotnet/aspnetcore/pull/37192#issuecomment-936589233 -RUN gem uninstall fpm -RUN yum remove -y rubygems -RUN yum remove -y ruby-devel -RUN yum --enablerepo=centos-sclo-rh -y install rh-ruby25 -RUN yum --enablerepo=centos-sclo-rh -y install rh-ruby25-ruby-devel -RUN yum --enablerepo=centos-sclo-rh -y install rh-ruby25-rubygems -RUN scl enable rh-ruby25 'gem install --no-document fpm' - RUN useradd -m ${USER} --uid ${USER_ID} -g root RUN echo '${USER} ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers diff --git a/src/Installers/Rpm/Directory.Build.targets b/src/Installers/Rpm/Directory.Build.targets index a3f65b11597e..07d01bb46ed6 100644 --- a/src/Installers/Rpm/Directory.Build.targets +++ b/src/Installers/Rpm/Directory.Build.targets @@ -85,7 +85,7 @@ - + Date: Fri, 15 Apr 2022 12:53:49 -0700 Subject: [PATCH 2/4] Update rhel.Dockerfile --- eng/docker/rhel.Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/eng/docker/rhel.Dockerfile b/eng/docker/rhel.Dockerfile index 3171723ed906..255adb1657c1 100644 --- a/eng/docker/rhel.Dockerfile +++ b/eng/docker/rhel.Dockerfile @@ -15,7 +15,6 @@ RUN echo '${USER} 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 chown root:root /usr/bin/sudo && chmod 4755 /usr/bin/sudo # Set user to the one we just created USER $USER_ID From 5276efc428852453a64958dd8bbc85d08993f8a5 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Thu, 5 May 2022 10:18:51 -0700 Subject: [PATCH 3/4] Update rhel.Dockerfile --- 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 255adb1657c1..7e465bc45f1f 100644 --- a/eng/docker/rhel.Dockerfile +++ b/eng/docker/rhel.Dockerfile @@ -1,5 +1,5 @@ # Dockerfile that creates a container suitable to build dotnet-cli -FROM mcr.microsoft.com/dotnet-buildtools/prereqs:rhel-7-rpmpkg-c982313-20174116044113 +FROM mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-rpmpkg-20220505130359-d0fa36f # Setup User to match Host User, and give superuser permissions ARG USER From 1a82c078ec583f02e10a3477db415a103ed39152 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Thu, 5 May 2022 10:31:06 -0700 Subject: [PATCH 4/4] Update Directory.Build.targets --- src/Installers/Rpm/Directory.Build.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Installers/Rpm/Directory.Build.targets b/src/Installers/Rpm/Directory.Build.targets index 07d01bb46ed6..a3f65b11597e 100644 --- a/src/Installers/Rpm/Directory.Build.targets +++ b/src/Installers/Rpm/Directory.Build.targets @@ -85,7 +85,7 @@ - +