commit
4b9cd1f579
3 changed files with 7 additions and 37 deletions
|
@ -33,7 +33,6 @@
|
||||||
<NoWarn>NU1701;NU5104</NoWarn>
|
<NoWarn>NU1701;NU5104</NoWarn>
|
||||||
|
|
||||||
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
|
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
|
||||||
<!-- https://github.com/dotnet/cli/issues/9834 - re-enable the flag below once warnings are cleared up -->
|
<MSBuildTreatWarningsAsErrors>true</MSBuildTreatWarningsAsErrors>
|
||||||
<!-- <MSBuildTreatWarningsAsErrors>true</MSBuildTreatWarningsAsErrors> -->
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
@ -94,7 +94,6 @@
|
||||||
UseHardlinksIfPossible="False" />
|
UseHardlinksIfPossible="False" />
|
||||||
|
|
||||||
<!-- Remove Shared Framework and Debian Packages -->
|
<!-- Remove Shared Framework and Debian Packages -->
|
||||||
<Exec Command="sudo dpkg -r $(SdkDebianPackageName)" IgnoreStandardErrorWarningFormat="true" />
|
|
||||||
<Exec Command="sudo dpkg -r $(AspNetCoreSharedFxDebianPackageName)" IgnoreStandardErrorWarningFormat="true" />
|
<Exec Command="sudo dpkg -r $(AspNetCoreSharedFxDebianPackageName)" IgnoreStandardErrorWarningFormat="true" />
|
||||||
<Exec Command="sudo dpkg -r $(SharedFxDebianPackageName)" IgnoreStandardErrorWarningFormat="true" />
|
<Exec Command="sudo dpkg -r $(SharedFxDebianPackageName)" IgnoreStandardErrorWarningFormat="true" />
|
||||||
<Exec Command="sudo dpkg -r $(HostFxrDebianPackageName)" IgnoreStandardErrorWarningFormat="true" />
|
<Exec Command="sudo dpkg -r $(HostFxrDebianPackageName)" IgnoreStandardErrorWarningFormat="true" />
|
||||||
|
@ -129,6 +128,9 @@
|
||||||
ToolPath="$(DebianInstalledDirectory)" />
|
ToolPath="$(DebianInstalledDirectory)" />
|
||||||
|
|
||||||
<!-- Clean up Packages -->
|
<!-- Clean up Packages -->
|
||||||
|
<!-- The following line is needed. So it won't warning dotnet folder is not empty after uninstall -->
|
||||||
|
<Exec Command="sudo rm -rf /usr/share/dotnet/sdk/NuGetFallbackFolder" />
|
||||||
|
|
||||||
<Exec Command="sudo dpkg -r $(SdkDebianPackageName)" IgnoreStandardErrorWarningFormat="true" />
|
<Exec Command="sudo dpkg -r $(SdkDebianPackageName)" IgnoreStandardErrorWarningFormat="true" />
|
||||||
<Exec Command="sudo dpkg -r $(AspNetCoreSharedFxDebianPackageName)" IgnoreStandardErrorWarningFormat="true" />
|
<Exec Command="sudo dpkg -r $(AspNetCoreSharedFxDebianPackageName)" IgnoreStandardErrorWarningFormat="true" />
|
||||||
<Exec Command="sudo dpkg -r $(SharedFxDebianPackageName)" IgnoreStandardErrorWarningFormat="true" />
|
<Exec Command="sudo dpkg -r $(SharedFxDebianPackageName)" IgnoreStandardErrorWarningFormat="true" />
|
||||||
|
|
|
@ -4,47 +4,16 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
# Dockerfile that creates a container suitable to build dotnet-cli
|
# Dockerfile that creates a container suitable to build dotnet-cli
|
||||||
FROM debian:jessie
|
FROM microsoft/dotnet-buildtools-prereqs:debian-8.2-debpkg-d770b8b-20180628122423
|
||||||
|
|
||||||
# Misc Dependencies for build
|
# Misc Dependencies for build
|
||||||
RUN apt-get update && \
|
RUN rm -rf /var/lib/apt/lists/* && \
|
||||||
|
apt-get update && \
|
||||||
apt-get -qqy install \
|
apt-get -qqy install \
|
||||||
curl \
|
|
||||||
unzip \
|
|
||||||
gettext \
|
|
||||||
sudo && \
|
sudo && \
|
||||||
apt-get clean && \
|
apt-get clean && \
|
||||||
rm -rf /var/lib/apt/lists/*
|
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/*
|
|
||||||
|
|
||||||
# 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
|
# Setup User to match Host User, and give superuser permissions
|
||||||
ARG USER_ID=0
|
ARG USER_ID=0
|
||||||
RUN useradd -m code_executor -u ${USER_ID} -g sudo
|
RUN useradd -m code_executor -u ${USER_ID} -g sudo
|
||||||
|
|
Loading…
Reference in a new issue