Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the linux dependencies in build folder #24137

Draft
wants to merge 30 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
54c94f9
Enable Linux RPM dependencies to be included
cheenamalhotra Jul 28, 2023
bce61d7
Revert "Update build container to use G++-7 (#23912)"
cheenamalhotra Jul 28, 2023
457300e
Merge branch 'main' into cheena/fix-rpm-dependencies
cssuh Aug 4, 2023
5fc05a6
Merge branch 'main' into cheena/fix-rpm-dependencies
cssuh Aug 4, 2023
07dda44
add changes from vscode
cssuh Aug 4, 2023
fe90069
update dependencies list
cssuh Aug 7, 2023
7695f5b
print arch
cssuh Aug 8, 2023
0e540d5
Merge branch 'main' into cheena/fix-rpm-dependencies
cssuh Aug 4, 2023
abce8ea
compile build folder
cssuh Aug 8, 2023
7d651d3
fix undefined join error
cssuh Aug 8, 2023
6583cfa
fix arch
cssuh Aug 8, 2023
900b586
comment out arch
cssuh Aug 8, 2023
8b85615
reset dep-lists back to 1.79
cssuh Aug 9, 2023
a83e874
reset calculate-deps back to 1.79
cssuh Aug 9, 2023
7ca7fa7
add compiled files
cssuh Aug 9, 2023
d1d2de1
change depedency list to add missing dependency
cssuh Aug 9, 2023
2243df5
remove extra deps
cssuh Aug 9, 2023
29761e4
add missing dependency to amd64
cssuh Aug 14, 2023
0ea8efd
fix dependencies list rpm
cssuh Aug 14, 2023
e2e2abd
fix last missing dependency
cssuh Aug 15, 2023
1a8c5b4
add xsel
cssuh Aug 17, 2023
a20d31d
add compiled version
cssuh Aug 17, 2023
094822e
add missing dependency
cssuh Aug 17, 2023
66e4059
remove xsel to test rpm build
cssuh Aug 18, 2023
55df7c7
Merge branch 'main' into cheena/fix-rpm-dependencies
cssuh Aug 28, 2023
e9ba466
remove package
cssuh Aug 29, 2023
38d4c61
add back swiftshader
cssuh Aug 29, 2023
19aa01c
run compile
cssuh Aug 29, 2023
b89bb1a
Revert "query result selection summary improvement (both perf and usa…
cssuh Aug 30, 2023
6427d08
Revert "Revert "query result selection summary improvement (both perf…
cssuh Aug 30, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 5 additions & 15 deletions build/azure-pipelines/linux/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
# Download base image ubuntu 20.04
FROM mcr.microsoft.com/mirror/docker/library/ubuntu:20.04
#Download base image ubuntu 22.04
FROM mcr.microsoft.com/mirror/docker/library/ubuntu:22.04

# Adding apt repos for g++-7
RUN echo "deb http://dk.archive.ubuntu.com/ubuntu/ bionic main" >> /etc/apt/sources.list
RUN echo "deb http://dk.archive.ubuntu.com/ubuntu/ bionic universe" >> /etc/apt/sources.list

# Set timezone to avoid blocking prompts on docker build
#Set timezone to avoid blocking prompts on docker build
ENV TZ=America/Los_Angeles
RUN ln -snf "/usr/share/zoneinfo/$TZ" /etc/localtime
RUN echo "$TZ" > /etc/timezone
Expand All @@ -18,19 +14,13 @@ RUN apt-get update && apt-get upgrade -y

RUN apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 dbus xvfb libgtk-3-0 \
libkrb5-dev git apt-transport-https ca-certificates curl gnupg-agent software-properties-common \
libnss3 libasound2 make gcc libx11-dev fakeroot rpm libgconf-2-4 libunwind8 g++-7 libgbm-dev wget


# make GCC 7 the default compiler
RUN rm /usr/bin/gcc
RUN ln -s /usr/bin/gcc-7 /usr/bin/gcc
RUN ln -s /usr/bin/g++-7 /usr/bin/g++
libnss3 libasound2 make gcc libx11-dev fakeroot rpm libgconf-2-4 libunwind8 g++ libgbm-dev wget

# Adding Libssl for dotnet 5.0 and ESRP signing to work
RUN wget -c http://security.ubuntu.com/ubuntu/pool/main/o/openssl1.0/libssl1.0.0_1.0.2n-1ubuntu5_amd64.deb
RUN dpkg -i libssl1.0.0_1.0.2n-1ubuntu5_amd64.deb

# docker
#docker
RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -
RUN apt-key fingerprint 0EBFCD88
RUN add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
Expand Down
2 changes: 1 addition & 1 deletion build/azure-pipelines/sql-product-build.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
resources:
containers:
- container: linux-x64
image: sqltoolscontainers.azurecr.io/linux-build-agent:9
image: sqltoolscontainers.azurecr.io/linux-build-agent:8
endpoint: SqlToolsContainers

stages:
Expand Down
12 changes: 10 additions & 2 deletions build/linux/debian/calculate-deps.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 9 additions & 1 deletion build/linux/debian/calculate-deps.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,16 @@ function calculatePackageDeps(binaryPath: string, arch: DebianArchString, sysroo
// on the newer package, this hack skips the dep. This is safe because
// libgcc-s1 is a dependency of libc6. This hack can be removed once
// support for Debian Buster and Ubuntu Bionic are dropped.
//
// Remove kerberos native module related dependencies as the versions
// computed from sysroot will not satisfy the minimum supported distros
// Refs https://github.com/microsoft/vscode/issues/188881.
// TODO(deepak1556): remove this workaround in favor of computing the
// versions from build container for native modules.
const filteredDeps = depsStr.split(', ').filter(dependency => {
return !dependency.startsWith('libgcc-s1');
return !dependency.startsWith('libgcc-s1') &&
!dependency.startsWith('libgssapi-krb5-2') &&
!dependency.startsWith('libkrb5-3');
}).sort();
const requires = new Set(filteredDeps);
return requires;
Expand Down