Skip to content

Commit 3921939

Browse files
authored
Try new docker image (#41194)
* Try new image * Update rhel.Dockerfile * Update rhel.Dockerfile * Update Directory.Build.targets
1 parent a02ffe7 commit 3921939

File tree

1 file changed

+1
-11
lines changed

1 file changed

+1
-11
lines changed

eng/docker/rhel.Dockerfile

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Dockerfile that creates a container suitable to build dotnet-cli
2-
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-rpmpkg-20210714125435-9b5bbc2
2+
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-rpmpkg-20220505130359-d0fa36f
33

44
# Setup User to match Host User, and give superuser permissions
55
ARG USER
@@ -9,22 +9,12 @@ ARG WORKDIR
99

1010
WORKDIR ${WORKDIR}
1111

12-
# Workaround per https://github.com/dotnet/aspnetcore/pull/37192#issuecomment-936589233
13-
RUN gem uninstall fpm
14-
RUN yum remove -y rubygems
15-
RUN yum remove -y ruby-devel
16-
RUN yum --enablerepo=centos-sclo-rh -y install rh-ruby25
17-
RUN yum --enablerepo=centos-sclo-rh -y install rh-ruby25-ruby-devel
18-
RUN yum --enablerepo=centos-sclo-rh -y install rh-ruby25-rubygems
19-
RUN scl enable rh-ruby25 'gem install --no-document fpm'
20-
2112
RUN useradd -m ${USER} --uid ${USER_ID} -g root
2213
RUN echo '${USER} ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
2314

2415
# With the User Change, we need to change permssions on these directories
2516
RUN chmod -R a+rwx /usr/local
2617
RUN chmod -R a+rwx /home
27-
RUN chown root:root /usr/bin/sudo && chmod 4755 /usr/bin/sudo
2818

2919
# Set user to the one we just created
3020
USER $USER_ID

0 commit comments

Comments
 (0)