From cfe7ab17c8545ced1d8a06c216aa08efbfe5fa63 Mon Sep 17 00:00:00 2001 From: pensivebrian Date: Wed, 27 Jan 2021 14:53:07 -0800 Subject: [PATCH 1/5] Add libicu66 dependency for ubuntu 20.04 --- build_scripts/debian/dir_creator.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_scripts/debian/dir_creator.sh b/build_scripts/debian/dir_creator.sh index 558b5384..e46c0b4f 100755 --- a/build_scripts/debian/dir_creator.sh +++ b/build_scripts/debian/dir_creator.sh @@ -54,7 +54,7 @@ Homepage: https://github.com/dbcli/mssql-cli Package: mssql-cli Architecture: all -Depends: libunwind8, libicu52 | libicu55 | libicu57 | libicu60, libffi-dev, less +Depends: libunwind8, libicu52 | libicu55 | libicu57 | libicu60 | libicu66, libffi-dev, less Description: mssql-cli We’re excited to introduce mssql-cli, a new and interactive command line query tool for SQL Server. This open source tool works cross-platform and proud to be a part of the dbcli.org community. From c883e0aa5855db32c01af95b695e8ffa1237ee02 Mon Sep 17 00:00:00 2001 From: pensivebrian Date: Wed, 27 Jan 2021 15:08:01 -0800 Subject: [PATCH 2/5] Add debian 10 support --- build_scripts/debian/dir_creator.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_scripts/debian/dir_creator.sh b/build_scripts/debian/dir_creator.sh index e46c0b4f..9ad4c664 100755 --- a/build_scripts/debian/dir_creator.sh +++ b/build_scripts/debian/dir_creator.sh @@ -54,7 +54,7 @@ Homepage: https://github.com/dbcli/mssql-cli Package: mssql-cli Architecture: all -Depends: libunwind8, libicu52 | libicu55 | libicu57 | libicu60 | libicu66, libffi-dev, less +Depends: libunwind8, libicu52 | libicu55 | libicu57 | libicu60 | libicu63 | libicu66 | libicu67, libffi-dev, less Description: mssql-cli We’re excited to introduce mssql-cli, a new and interactive command line query tool for SQL Server. This open source tool works cross-platform and proud to be a part of the dbcli.org community. From 7385a1ca72aa0c09ba9667f362d230a20e31607a Mon Sep 17 00:00:00 2001 From: pensivebrian Date: Mon, 1 Feb 2021 19:16:34 -0800 Subject: [PATCH 3/5] Use python 3.7.9 for deb packages --- build_scripts/debian/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_scripts/debian/build.sh b/build_scripts/debian/build.sh index 88a196f2..96a59441 100755 --- a/build_scripts/debian/build.sh +++ b/build_scripts/debian/build.sh @@ -42,7 +42,7 @@ rm -rf $source_dir/../debian_output # Build Python from source and include python_archive=$(mktemp) -wget https://www.python.org/ftp/python/3.6.1/Python-3.6.1.tgz -qO $python_archive +wget https://www.python.org/ftp/python/3.7.9/Python-3.7.9.tgz -qO $python_archive # A copy of Python is created for build dependencies only python_dir=$(mktemp -d) From 78edd7d23fb5c8c59cb35df2b38a153ddd84eab5 Mon Sep 17 00:00:00 2001 From: pensivebrian Date: Mon, 1 Feb 2021 21:35:41 -0800 Subject: [PATCH 4/5] Use python 3.8.7 for deb packages --- build_scripts/debian/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_scripts/debian/build.sh b/build_scripts/debian/build.sh index 96a59441..46741a2a 100755 --- a/build_scripts/debian/build.sh +++ b/build_scripts/debian/build.sh @@ -42,7 +42,7 @@ rm -rf $source_dir/../debian_output # Build Python from source and include python_archive=$(mktemp) -wget https://www.python.org/ftp/python/3.7.9/Python-3.7.9.tgz -qO $python_archive +wget https://www.python.org/ftp/python/3.8.7/Python-3.8.7.tgz -qO $python_archive # A copy of Python is created for build dependencies only python_dir=$(mktemp -d) From 4e556366e8f176d48da4c7893e782f9a9a7977a4 Mon Sep 17 00:00:00 2001 From: pensivebrian Date: Tue, 2 Feb 2021 20:45:40 -0800 Subject: [PATCH 5/5] Build .deb package using ubuntu 20.04 --- build_scripts/debian/Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/build_scripts/debian/Dockerfile b/build_scripts/debian/Dockerfile index a46d0788..5c7e75aa 100644 --- a/build_scripts/debian/Dockerfile +++ b/build_scripts/debian/Dockerfile @@ -1,5 +1,5 @@ # Builds .deb and installs dependencies to support release -FROM ubuntu:16.04 +FROM ubuntu:20.04 ARG AZURE_STORAGE_CONNECTION_STRING ARG MSSQL_CLI_OFFICIAL_BUILD @@ -9,8 +9,9 @@ ENV MSSQL_CLI_OFFICIAL_BUILD=$MSSQL_CLI_OFFICIAL_BUILD RUN echo "connection string: ${AZURE_STORAGE_CONNECTION_STRING}" RUN echo "official build: ${MSSQL_CLI_OFFICIAL_BUILD}" -RUN apt-get update -RUN apt-get -y install python3-all python3-pip python3-setuptools nano git sudo wget libssl-dev libffi-dev debhelper +RUN apt-get update \ +&& DEBIAN_FRONTEND="noninteractive" TZ="America/Pacific" \ +apt-get -y -q install python3-all python3-pip python3-setuptools nano git sudo wget libssl-dev libffi-dev debhelper # Install pip and stdeb RUN python3 -m pip install --upgrade pip