Remove opensuse (#4955)
This commit is contained in:
William Li
GitHub
parent
3cceab1b79
commit
4c79da6f03
8 changed files with 3 additions and 148 deletions
|
|
@ -130,13 +130,6 @@ stages:
|
|||
_RuntimeIdentifier: ''
|
||||
_BuildArchitecture: 'x64'
|
||||
_DropSuffix: ''
|
||||
Build_OpenSUSE_42_3_Debug_x64:
|
||||
_BuildConfig: Debug
|
||||
_DockerParameter: '--docker opensuse.42.3'
|
||||
_LinuxPortable: '--linux-portable'
|
||||
_RuntimeIdentifier: ''
|
||||
_BuildArchitecture: 'x64'
|
||||
_DropSuffix: ''
|
||||
Build_CentOS_7_1_Debug_x64:
|
||||
_BuildConfig: Debug
|
||||
_DockerParameter: '--docker centos'
|
||||
|
|
|
|||
|
|
@ -1,26 +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.
|
||||
#
|
||||
|
||||
FROM microsoft/dotnet-buildtools-prereqs:opensuse132_prereqs_v4
|
||||
|
||||
RUN zypper -n install sudo \
|
||||
ncurses-utils && \
|
||||
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
|
||||
ARG WORK_DIR
|
||||
WORKDIR ${WORK_DIR}
|
||||
|
|
@ -1,51 +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.
|
||||
#
|
||||
|
||||
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
|
||||
ARG WORK_DIR
|
||||
WORKDIR ${WORK_DIR}
|
||||
|
|
@ -1,50 +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.
|
||||
#
|
||||
|
||||
FROM microsoft/dotnet-buildtools-prereqs:opensuse-42.3-d46ee12-20180327014902
|
||||
|
||||
# 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 && \
|
||||
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
|
||||
ARG WORK_DIR
|
||||
WORKDIR ${WORK_DIR}
|
||||
|
|
@ -79,12 +79,6 @@ if [ -z "$DOCKERFILE" ]; then
|
|||
echo "using 'fedora.23' image"
|
||||
export DOCKERFILE=eng/docker/fedora.23
|
||||
fi
|
||||
elif [ "$(cat /etc/*-release | grep -cim1 opensuse)" -eq 1 ]; then
|
||||
echo "Detected current OS as openSUSE, determining openSUSE version to use..."
|
||||
if [ "$(cat /etc/*-release | grep -cim1 13.2)" -eq 1 ]; then
|
||||
echo "using 'openSUSE.13.2' image"
|
||||
export DOCKERFILE=eng/docker/opensuse.13.2
|
||||
fi
|
||||
else
|
||||
echo "Unknown Linux Distro. Using 'ubuntu' image"
|
||||
export DOCKERFILE=eng/docker/ubuntu
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@ def platformList = [
|
|||
'Linux:x64:Release',
|
||||
'Linux_NoSuffix:arm:Release',
|
||||
'Linux_NoSuffix:x64:Release',
|
||||
'opensuse.42.3:x64:Debug',
|
||||
'OSX10.12:x64:Release',
|
||||
'RHEL6:x64:Debug',
|
||||
'RHEL7.2:x64:Release',
|
||||
|
|
@ -95,7 +94,7 @@ ${buildCommand}
|
|||
osUsedForMachineAffinity = 'Ubuntu16.04';
|
||||
buildCommand = "${baseShellBuildCommand} --runtime-id rhel.6-x64 --docker rhel.6"
|
||||
}
|
||||
else if (os == 'ubuntu.18.04' || os == 'fedora.27' || os == 'opensuse.42.3') {
|
||||
else if (os == 'ubuntu.18.04' || os == 'fedora.27') {
|
||||
osUsedForMachineAffinity = 'Ubuntu16.04'
|
||||
osVersionUsedForMachineAffinity = 'latest-docker'
|
||||
buildCommand = "${baseShellBuildCommand} --docker ${os} --linux-portable"
|
||||
|
|
|
|||
|
|
@ -28,15 +28,13 @@
|
|||
<ProductMonikerRid Condition=" '$(Rid)' == 'ubuntu.16.04-x64' OR
|
||||
'$(Rid)' == 'fedora.24-x64' OR
|
||||
'$(Rid)' == 'rhel.6-x64' OR
|
||||
'$(Rid)' == 'linux-musl-x64' OR
|
||||
'$(Rid)' == 'opensuse.42.1-x64' ">$(Rid)</ProductMonikerRid>
|
||||
'$(Rid)' == 'linux-musl-x64' ">$(Rid)</ProductMonikerRid>
|
||||
<ProductMonikerRid Condition=" '$(ProductMonikerRid)' == '' ">$(OSName)-$(Architecture)</ProductMonikerRid>
|
||||
|
||||
<HostMonikerRid Condition=" '$(HostRid)' == 'ubuntu.16.04-x64' OR
|
||||
'$(HostRid)' == 'fedora.24-x64' OR
|
||||
'$(HostRid)' == 'rhel.6-x64' OR
|
||||
'$(HostRid)' == 'linux-musl-x64' OR
|
||||
'$(HostRid)' == 'opensuse.42.1-x64' ">$(HostRid)</HostMonikerRid>
|
||||
'$(HostRid)' == 'linux-musl-x64' ">$(HostRid)</HostMonikerRid>
|
||||
<HostMonikerRid Condition=" '$(HostMonikerRid)' == '' ">$(HostOSName)-$(Architecture)</HostMonikerRid>
|
||||
<HostMonikerRidForFileName>$(HostMonikerRid)</HostMonikerRidForFileName>
|
||||
<HostMonikerRidForFileName Condition=" '$(IsDebianBaseDistro)' == 'true' OR '$(IsRPMBasedDistro)' == 'true' ">$(Architecture)</HostMonikerRidForFileName>
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@
|
|||
OR $(Rid.StartsWith('freebsd'))
|
||||
OR $(Rid.StartsWith('linux-musl'))
|
||||
OR $(Rid.StartsWith('fedora.27'))
|
||||
OR $(Rid.StartsWith('opensuse.42.3'))
|
||||
OR $(Rid.StartsWith('ubuntu.18.04')))">true</SkipBuildingInstallers>
|
||||
<SkipBuildingInstallers Condition=" '$(SkipBuildingInstallers)' == '' ">false</SkipBuildingInstallers>
|
||||
|
||||
|
|
@ -20,7 +19,6 @@
|
|||
AND '$(Rid)' != 'rhel.6-x64'
|
||||
AND '$(Rid)' != 'linux-musl-x64'
|
||||
AND '$(Rid)' != 'fedora.27-x64'
|
||||
AND '$(Rid)' != 'opensuse.42.3-x64'
|
||||
AND '$(Rid)' != 'ubuntu.18.04-x64'">true</IncludeSharedFrameworksForBackwardsCompatibilityTests>-->
|
||||
<HighEntropyVA>true</HighEntropyVA>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue