From c490ec42ef2382319d184cbb0d5f667247ada74e Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 24 May 2022 10:07:47 -0700 Subject: [PATCH 1/5] Update Dockerfile --- eng/docker/ubuntu.18.04/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/docker/ubuntu.18.04/Dockerfile b/eng/docker/ubuntu.18.04/Dockerfile index 0ba3da86b..85ac0d00a 100644 --- a/eng/docker/ubuntu.18.04/Dockerfile +++ b/eng/docker/ubuntu.18.04/Dockerfile @@ -12,6 +12,7 @@ RUN apt-get update && \ libcurl4 \ sudo && \ apt-get clean && \ + apt-get devscripts && \ rm -rf /var/lib/apt/lists/* # Setup User to match Host User, and give superuser permissions From e61bb144038792911ae2f3b04688f15fe9bc005d Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 24 May 2022 10:31:29 -0700 Subject: [PATCH 2/5] Fix devscripts install --- eng/docker/ubuntu.18.04/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/docker/ubuntu.18.04/Dockerfile b/eng/docker/ubuntu.18.04/Dockerfile index 85ac0d00a..c07d27cf0 100644 --- a/eng/docker/ubuntu.18.04/Dockerfile +++ b/eng/docker/ubuntu.18.04/Dockerfile @@ -10,9 +10,9 @@ RUN apt-get update && \ apt-get -qqy install \ curl \ libcurl4 \ + devscripts \ sudo && \ apt-get clean && \ - apt-get devscripts && \ rm -rf /var/lib/apt/lists/* # Setup User to match Host User, and give superuser permissions From aea4d463e61faa53eeb259afe4a9cbc189b08ac1 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 24 May 2022 11:29:53 -0700 Subject: [PATCH 3/5] Update Dockerfile --- eng/docker/ubuntu.18.04/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/docker/ubuntu.18.04/Dockerfile b/eng/docker/ubuntu.18.04/Dockerfile index c07d27cf0..1f8175001 100644 --- a/eng/docker/ubuntu.18.04/Dockerfile +++ b/eng/docker/ubuntu.18.04/Dockerfile @@ -11,6 +11,7 @@ RUN apt-get update && \ curl \ libcurl4 \ devscripts \ + debhelper \ sudo && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* From 4ba8c44fad0463aaa1e84804e03dbf51ee20ca6e Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 25 May 2022 16:35:08 -0700 Subject: [PATCH 4/5] Remove the old docker files --- .vsts-ci.yml | 9 +---- eng/docker/ubuntu.16.04/Dockerfile | 65 ------------------------------ eng/docker/ubuntu.16.10/Dockerfile | 64 ----------------------------- 3 files changed, 1 insertion(+), 137 deletions(-) delete mode 100644 eng/docker/ubuntu.16.04/Dockerfile delete mode 100644 eng/docker/ubuntu.16.10/Dockerfile diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 4a1ca1503..3c8408e94 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -156,13 +156,6 @@ stages: strategy: matrix: ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: - Build_Ubuntu_16_04_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker ubuntu.16.04' - _LinuxPortable: '' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _TestArg: $(_NonWindowsTestArg) Build_Ubuntu_18_04_Debug_x64: _BuildConfig: Debug _DockerParameter: '--docker ubuntu.18.04' @@ -297,7 +290,7 @@ stages: _AdditionalBuildParameters: '/p:HostOSName="linux-musl"' Build_Linux_Portable_Deb_Release_x64: _BuildConfig: Release - _DockerParameter: '--docker ubuntu.16.04' + _DockerParameter: '--docker ubuntu.18.04' _LinuxPortable: '--linux-portable' _RuntimeIdentifier: '' _BuildArchitecture: 'x64' diff --git a/eng/docker/ubuntu.16.04/Dockerfile b/eng/docker/ubuntu.16.04/Dockerfile deleted file mode 100644 index c58504613..000000000 --- a/eng/docker/ubuntu.16.04/Dockerfile +++ /dev/null @@ -1,65 +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 ubuntu:16.04 - -# 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 rm -rf rm -rf /var/lib/apt/lists/* && \ - apt-get clean && \ - apt-get update && \ - apt-get install -y cmake \ - make \ - llvm-3.5 \ - clang-3.5 \ - git \ - curl \ - tar \ - sudo && \ - apt-get clean - -# Install Build Prereqs -RUN apt-get -qqy install \ - debhelper \ - build-essential \ - devscripts && \ - apt-get clean - -# Dependencies for CoreCLR and CoreFX -RUN apt-get install -y libunwind8 \ - libkrb5-3 \ - libicu55 \ - liblttng-ust0 \ - libssl1.0.0 \ - zlib1g \ - libuuid1 \ - liblldb-3.6 && \ - apt-get clean - -# 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 working directory -ARG WORK_DIR -WORKDIR ${WORK_DIR} - -# Set up Azure Artifacts credential provider. -# We download the installer and execute it using ${USER_ID} so that the installer -# put the NuGet plugins in the correct $HOME/.nuget folder. -RUN curl -O https://raw.githubusercontent.com/Microsoft/artifacts-credprovider/master/helpers/installcredprovider.sh -RUN chmod +x ./installcredprovider.sh - -# Set user to the one we just created -USER ${USER_ID} - -RUN ./installcredprovider.sh diff --git a/eng/docker/ubuntu.16.10/Dockerfile b/eng/docker/ubuntu.16.10/Dockerfile deleted file mode 100644 index 0497a6fb5..000000000 --- a/eng/docker/ubuntu.16.10/Dockerfile +++ /dev/null @@ -1,64 +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. -# - -# 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 -ARG WORK_DIR -WORKDIR ${WORK_DIR} \ No newline at end of file From 8b16a6268fcfa764ca490972f8fee3e1b34fe3f0 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 3 Jun 2022 09:12:24 -0700 Subject: [PATCH 5/5] Only run the deb build on specific legs --- .vsts-ci.yml | 3 ++- src/redist/targets/GenerateDebs.targets | 11 +++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 3c8408e94..dc9e774c6 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -183,6 +183,7 @@ stages: _LinuxPortable: '' _RuntimeIdentifier: '' _BuildArchitecture: 'x64' + _AdditionalBuildParameters: '/p:BuildSdkDeb=true' _TestArg: $(_NonWindowsTestArg) Build_Rhel_7_2_Release_x64: _BuildConfig: Release @@ -296,7 +297,7 @@ stages: _BuildArchitecture: 'x64' # Do not publish zips and tarballs. The linux-x64 binaries are # already published by Build_LinuxPortable_Release_x64 - _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false' + _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false;BuildSdkDeb=true' _TestArg: $(_NonWindowsTestArg) Build_Linux_Portable_Rpm_Release_x64: _BuildConfig: Release diff --git a/src/redist/targets/GenerateDebs.targets b/src/redist/targets/GenerateDebs.targets index 7135c8672..f0e7e5d14 100644 --- a/src/redist/targets/GenerateDebs.targets +++ b/src/redist/targets/GenerateDebs.targets @@ -228,7 +228,7 @@ true + false -