From 42453bec7437018c6ad024391f717b5183db238f Mon Sep 17 00:00:00 2001 From: Jarret Shook Date: Thu, 9 Jul 2020 18:34:06 -0700 Subject: [PATCH] Cleanup references to centos 6 (#39006) * Remove Dockerfile * Remove references to dockerfiles in runtime. These exist in dotnet-buildtools-prereqs. --- .../building/coreclr/linux-instructions.md | 1 - tools-local/scripts/docker/centos.7/Dockerfile | 58 ---------------- tools-local/scripts/docker/debian.8/Dockerfile | 77 ---------------------- tools-local/scripts/docker/fedora.24/Dockerfile | 28 -------- .../scripts/docker/opensuse.42.1/Dockerfile | 50 -------------- tools-local/scripts/docker/ubuntu.14.04/Dockerfile | 63 ------------------ tools-local/scripts/docker/ubuntu.16.04/Dockerfile | 63 ------------------ tools-local/scripts/docker/ubuntu.16.10/Dockerfile | 63 ------------------ 8 files changed, 403 deletions(-) delete mode 100644 tools-local/scripts/docker/centos.7/Dockerfile delete mode 100644 tools-local/scripts/docker/debian.8/Dockerfile delete mode 100644 tools-local/scripts/docker/fedora.24/Dockerfile delete mode 100644 tools-local/scripts/docker/opensuse.42.1/Dockerfile delete mode 100644 tools-local/scripts/docker/ubuntu.14.04/Dockerfile delete mode 100644 tools-local/scripts/docker/ubuntu.16.04/Dockerfile delete mode 100644 tools-local/scripts/docker/ubuntu.16.10/Dockerfile diff --git a/docs/workflow/building/coreclr/linux-instructions.md b/docs/workflow/building/coreclr/linux-instructions.md index b2c5e61..30bfb72 100644 --- a/docs/workflow/building/coreclr/linux-instructions.md +++ b/docs/workflow/building/coreclr/linux-instructions.md @@ -51,7 +51,6 @@ This table of images might often become stale as we change our images as our req | --------------------------- | --------------- | ---------------------------------------------------------------------------------------------------- | -------------------- | ------------- | | Ubuntu 16.04 | x64 | `mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-a50a721-20191120200116` | - | -clang9 | | Alpine | x64 | `mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.9-WithNode-0fc54a3-20190918214015` | - | -clang9 | -| CentOS 6 (build for RHEL 6) | x64 | `mcr.microsoft.com/dotnet-buildtools/prereqs:centos-6-f39df28-20191023143802` | - | -clang9 | | CentOS 7 (build for RHEL 7) | x64 | `mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-359e48e-20200313130914` | - | -clang9 | | Ubuntu 16.04 | arm32 (armhf) | `mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-cross-20200413125008-09ec757` | `/crossrootfs/arm` | -clang9 | | Ubuntu 16.04 | arm64 (arm64v8) | `mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-cross-arm64-20200413125008-cfdd435` | `/crossrootfs/arm64` | -clang9 | diff --git a/tools-local/scripts/docker/centos.7/Dockerfile b/tools-local/scripts/docker/centos.7/Dockerfile deleted file mode 100644 index 464337f..0000000 --- a/tools-local/scripts/docker/centos.7/Dockerfile +++ /dev/null @@ -1,58 +0,0 @@ -# -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. -# - -# Dockerfile that creates a container suitable to build dotnet-cli -FROM centos:7.1.1503 - -# Swap the "fakesystemd" package with the real "systemd" package, because fakesystemd conflicts with openssl-devel. -# The CentOS Docker image uses fakesystemd instead of systemd to reduce disk space. -RUN yum -q -y swap -- remove fakesystemd -- install systemd systemd-libs - -RUN yum -q -y install deltarpm -RUN yum -q -y install epel-release -# RUN yum -y update - -# This could become a "microsoft/coreclr" image, since it just installs the dependencies for CoreCLR (and stdlib) -# Install CoreCLR and CoreFx dependencies -RUN yum -q -y install unzip libunwind gettext libcurl-devel openssl-devel zlib libicu-devel - -# RUN apt-get update && \ -# apt-get -qqy install unzip curl libicu-dev libunwind8 gettext libssl-dev libcurl3-gnutls zlib1g liblttng-ust-dev lldb-3.6-dev lldb-3.6 - -# Install Build Prereqs -# CMake 3.3.2 from GhettoForge; LLVM 3.6.2 built from source ourselves; -RUN yum install -y http://mirror.symnds.com/distributions/gf/el/7/plus/x86_64/cmake-3.3.2-1.gf.el7.x86_64.rpm \ - https://matell.blob.core.windows.net/rpms/clang-3.6.2-1.el7.centos.x86_64.rpm \ - https://matell.blob.core.windows.net/rpms/clang-libs-3.6.2-1.el7.centos.x86_64.rpm \ - https://matell.blob.core.windows.net/rpms/lldb-3.6.2-1.el7.centos.x86_64.rpm \ - https://matell.blob.core.windows.net/rpms/lldb-devel-3.6.2-1.el7.centos.x86_64.rpm \ - https://matell.blob.core.windows.net/rpms/llvm-3.6.2-1.el7.centos.x86_64.rpm \ - https://matell.blob.core.windows.net/rpms/llvm-libs-3.6.2-1.el7.centos.x86_64.rpm \ - which \ - make - -RUN yum -q -y install tar git - -# Use clang as c++ compiler -RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++ 100 -RUN update-alternatives --set c++ /usr/bin/clang++ - -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 working directory -WORKDIR /opt/code diff --git a/tools-local/scripts/docker/debian.8/Dockerfile b/tools-local/scripts/docker/debian.8/Dockerfile deleted file mode 100644 index 444baf3..0000000 --- a/tools-local/scripts/docker/debian.8/Dockerfile +++ /dev/null @@ -1,77 +0,0 @@ -# -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. -# - -# Dockerfile that creates a container suitable to build dotnet-cli -FROM debian:jessie - -# Misc Dependencies for build -RUN apt-get update && \ - apt-get -qqy install \ - curl \ - wget \ - unzip \ - gettext \ - sudo && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -# This could become a "microsoft/coreclr" image, since it just installs the dependencies for CoreCLR (and stdlib) -RUN apt-get update &&\ - apt-get -qqy install \ - libunwind8 \ - libkrb5-3 \ - libicu52 \ - liblttng-ust0 \ - libssl1.0.0 \ - zlib1g \ - libuuid1 && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -# Install Build Prereqs -RUN apt-get update && \ - apt-get -qqy install \ - debhelper \ - build-essential \ - devscripts \ - git \ - cmake \ - clang-3.5 && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -# liblldb is needed so deb package build does not throw missing library info errors -RUN wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key|sudo apt-key add - -RUN echo "deb http://llvm.org/apt/jessie/ llvm-toolchain-jessie-3.6 main" > /etc/apt/sources.list.d/llvm-toolchain.list -RUN apt-get update && \ - apt-get -qqy install liblldb-3.6 && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -# Use clang as c++ compiler -RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-3.5 100 -RUN update-alternatives --set c++ /usr/bin/clang++-3.5 - -# Setup User to match Host User, and give superuser permissions -ARG USER_ID=0 -RUN useradd -m code_executor -u ${USER_ID} -g sudo -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 chmod -R 755 /usr/lib/sudo - -# Set user to the one we just created -USER ${USER_ID} - -# Set working directory -WORKDIR /opt/code - -# Work around https://github.com/dotnet/cli/issues/1582 until Docker releases a -# fix (https://github.com/docker/docker/issues/20818). This workaround allows -# the container to be run with the default seccomp Docker settings by avoiding -# the restart_syscall made by LTTng which causes a failed assertion. -ENV LTTNG_UST_REGISTER_TIMEOUT 0 diff --git a/tools-local/scripts/docker/fedora.24/Dockerfile b/tools-local/scripts/docker/fedora.24/Dockerfile deleted file mode 100644 index bc33dd0..0000000 --- a/tools-local/scripts/docker/fedora.24/Dockerfile +++ /dev/null @@ -1,28 +0,0 @@ -FROM fedora:24 - -RUN dnf install -y bash git cmake wget which python clang-3.8.0-1.fc24.x86_64 llvm-devel-3.8.0-1.fc24.x86_64 make libicu-devel lldb-devel.x86_64 \ - libunwind-devel.x86_64 lttng-ust-devel.x86_64 uuid-devel libuuid-devel tar glibc-locale-source zlib-devel libcurl-devel \ - krb5-devel openssl-devel autoconf libtool hostname - -RUN dnf upgrade -y nss - -RUN dnf clean all - -# Set a different rid to publish buildtools for, until we update to a version which -# natively supports fedora.24-x64 -ENV __PUBLISH_RID=fedora.23-x64 - -# Setup User to match Host User, and give superuser permissions -ARG USER_ID=0 -RUN useradd -m code_executor -u ${USER_ID} -g wheel -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 - -# Set user to the one we just created -USER ${USER_ID} - -# Set working directory -WORKDIR /opt/code diff --git a/tools-local/scripts/docker/opensuse.42.1/Dockerfile b/tools-local/scripts/docker/opensuse.42.1/Dockerfile deleted file mode 100644 index 1a7d845..0000000 --- a/tools-local/scripts/docker/opensuse.42.1/Dockerfile +++ /dev/null @@ -1,50 +0,0 @@ -# -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. -# - -FROM opensuse:42.1 - -# Install the base toolchain we need to build anything (clang, cmake, make and the like) -# this does not include libraries that we need to compile different projects, we'd like -# them in a different layer. -RUN zypper -n install binutils \ - cmake \ - which \ - gcc \ - llvm-clang \ - tar \ - ncurses-utils \ - curl \ - git \ - sudo && \ - ln -s /usr/bin/clang++ /usr/bin/clang++-3.5 && \ - zypper clean -a - -# Dependencies of CoreCLR and CoreFX. - -RUN zypper -n install --force-resolution \ - libunwind \ - libicu \ - lttng-ust \ - libuuid1 \ - libopenssl1_0_0 \ - libcurl4 \ - krb5 && \ - zypper clean -a - -# Setup User to match Host User, and give superuser permissions -ARG USER_ID=0 -RUN useradd -m code_executor -u ${USER_ID} -g wheel -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 chmod -R 755 /usr/lib/sudo - -# Set user to the one we just created -USER ${USER_ID} - -# Set working directory -WORKDIR /opt/code diff --git a/tools-local/scripts/docker/ubuntu.14.04/Dockerfile b/tools-local/scripts/docker/ubuntu.14.04/Dockerfile deleted file mode 100644 index 2f00958..0000000 --- a/tools-local/scripts/docker/ubuntu.14.04/Dockerfile +++ /dev/null @@ -1,63 +0,0 @@ -# -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. -# - -# Dockerfile that creates a container suitable to build dotnet-cli -FROM ubuntu:14.04 - -# Misc Dependencies for build -RUN apt-get update && \ - apt-get -qqy install \ - curl \ - unzip \ - gettext \ - sudo && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -# This could become a "microsoft/coreclr" image, since it just installs the dependencies for CoreCLR (and stdlib) -RUN apt-get update && \ - apt-get -qqy install \ - libunwind8 \ - libkrb5-3 \ - libicu52 \ - liblttng-ust0 \ - libssl1.0.0 \ - zlib1g \ - libuuid1 && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -# Install Build Prereqs -RUN apt-get update && \ - apt-get -qqy install \ - debhelper \ - build-essential \ - devscripts \ - git \ - cmake \ - clang-3.5 \ - lldb-3.6 && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -# Use clang as c++ compiler -RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-3.5 100 -RUN update-alternatives --set c++ /usr/bin/clang++-3.5 - -# Setup User to match Host User, and give superuser permissions -ARG USER_ID=0 -RUN useradd -m code_executor -u ${USER_ID} -g sudo -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 chmod -R 755 /usr/lib/sudo - -# Set user to the one we just created -USER ${USER_ID} - -# Set working directory -WORKDIR /opt/code diff --git a/tools-local/scripts/docker/ubuntu.16.04/Dockerfile b/tools-local/scripts/docker/ubuntu.16.04/Dockerfile deleted file mode 100644 index 9f89863..0000000 --- a/tools-local/scripts/docker/ubuntu.16.04/Dockerfile +++ /dev/null @@ -1,63 +0,0 @@ -# -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. -# - -# Dockerfile that creates a container suitable to build dotnet-cli -FROM ubuntu:16.04 - -# Misc Dependencies for build -RUN apt-get update && \ - apt-get -qqy install \ - curl \ - unzip \ - gettext \ - sudo && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -# This could become a "microsoft/coreclr" image, since it just installs the dependencies for CoreCLR (and stdlib) -RUN apt-get update && \ - apt-get -qqy install \ - libunwind8 \ - libkrb5-3 \ - libicu55 \ - liblttng-ust0 \ - libssl1.0.0 \ - zlib1g \ - libuuid1 \ - liblldb-3.6 && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -# Install Build Prereqs -RUN apt-get update && \ - apt-get -qqy install \ - debhelper \ - build-essential \ - devscripts \ - git \ - cmake \ - clang-3.5 && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -# Use clang as c++ compiler -RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-3.5 100 -RUN update-alternatives --set c++ /usr/bin/clang++-3.5 - -# Setup User to match Host User, and give superuser permissions -ARG USER_ID=0 -RUN useradd -m code_executor -u ${USER_ID} -g sudo -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 chmod -R 755 /usr/lib/sudo - -# Set user to the one we just created -USER ${USER_ID} - -# Set working directory -WORKDIR /opt/code diff --git a/tools-local/scripts/docker/ubuntu.16.10/Dockerfile b/tools-local/scripts/docker/ubuntu.16.10/Dockerfile deleted file mode 100644 index 98065c5..0000000 --- a/tools-local/scripts/docker/ubuntu.16.10/Dockerfile +++ /dev/null @@ -1,63 +0,0 @@ -# -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. -# - -# Dockerfile that creates a container suitable to build dotnet-cli -FROM ubuntu:16.10 - -# Misc Dependencies for build -RUN apt-get update && \ - apt-get -qqy install \ - curl \ - unzip \ - gettext \ - sudo && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -# This could become a "microsoft/coreclr" image, since it just installs the dependencies for CoreCLR (and stdlib) -RUN apt-get update && \ - apt-get -qqy install \ - libunwind8 \ - libkrb5-3 \ - libicu57 \ - liblttng-ust0 \ - libssl1.0.0 \ - zlib1g \ - libuuid1 \ - liblldb-3.5 && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -# Install Build Prereqs -RUN apt-get update && \ - apt-get -qqy install \ - debhelper \ - build-essential \ - devscripts \ - git \ - cmake \ - clang-3.5 && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -# Use clang as c++ compiler -RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-3.5 100 -RUN update-alternatives --set c++ /usr/bin/clang++-3.5 - -# Setup User to match Host User, and give superuser permissions -ARG USER_ID=0 -RUN useradd -m code_executor -u ${USER_ID} -g sudo -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 chmod -R 755 /usr/lib/sudo - -# Set user to the one we just created -USER ${USER_ID} - -# Set working directory -WORKDIR /opt/code -- 2.7.4