From 7e0bb1a9dada75f0051b5927c9c4b57d26951ca5 Mon Sep 17 00:00:00 2001 From: Cormac McCarthy Date: Tue, 2 Jan 2024 15:15:14 -0500 Subject: [PATCH 1/4] Pin versions of Microsoft ODBC packages used for Python --- images/runtime/python/install-dependencies.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/runtime/python/install-dependencies.sh b/images/runtime/python/install-dependencies.sh index b96920de42..1c51a6f64a 100755 --- a/images/runtime/python/install-dependencies.sh +++ b/images/runtime/python/install-dependencies.sh @@ -50,8 +50,8 @@ apt-get update \ apt-transport-https \ && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \ && locale-gen \ - && ACCEPT_EULA=Y apt-get install -y msodbcsql17 \ - && ACCEPT_EULA=Y apt-get install -y msodbcsql18 \ + && ACCEPT_EULA=Y apt-get install -y msodbcsql17=17.10.4.1-1 \ + && ACCEPT_EULA=Y apt-get install -y msodbcsql18=18.2.2.1-1 \ && ACCEPT_EULA=Y apt-get install -y mssql-tools18 \ && echo 'export PATH="$PATH:/opt/mssql-tools18/bin"' >> ~/.bashrc \ && source ~/.bashrc \ From 48b3a14dfbf8870fb31535f4fcbb5278233e2e2f Mon Sep 17 00:00:00 2001 From: Cormac McCarthy Date: Thu, 4 Jan 2024 14:37:37 -0500 Subject: [PATCH 2/4] Don't wait for input from user to install ODBC packages via APT --- images/runtime/python/install-dependencies.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/runtime/python/install-dependencies.sh b/images/runtime/python/install-dependencies.sh index 1c51a6f64a..b96050a073 100755 --- a/images/runtime/python/install-dependencies.sh +++ b/images/runtime/python/install-dependencies.sh @@ -50,8 +50,8 @@ apt-get update \ apt-transport-https \ && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \ && locale-gen \ - && ACCEPT_EULA=Y apt-get install -y msodbcsql17=17.10.4.1-1 \ - && ACCEPT_EULA=Y apt-get install -y msodbcsql18=18.2.2.1-1 \ + && DEBIAN_FRONTEND=noninteractive ACCEPT_EULA=Y apt-get install -y msodbcsql17=17.10.4.1-1 \ + && DEBIAN_FRONTEND=noninteractive ACCEPT_EULA=Y apt-get install -y msodbcsql18=18.2.2.1-1 \ && ACCEPT_EULA=Y apt-get install -y mssql-tools18 \ && echo 'export PATH="$PATH:/opt/mssql-tools18/bin"' >> ~/.bashrc \ && source ~/.bashrc \ From d5f4599632611f3448b4743e12eaef41ef2a99d9 Mon Sep 17 00:00:00 2001 From: "REDMOND\\williamhe" Date: Thu, 4 Jan 2024 16:58:14 -0800 Subject: [PATCH 3/4] Accept EULA --- images/runtime/python/install-dependencies.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/images/runtime/python/install-dependencies.sh b/images/runtime/python/install-dependencies.sh index b96050a073..92db7c3114 100755 --- a/images/runtime/python/install-dependencies.sh +++ b/images/runtime/python/install-dependencies.sh @@ -50,8 +50,10 @@ apt-get update \ apt-transport-https \ && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \ && locale-gen \ - && DEBIAN_FRONTEND=noninteractive ACCEPT_EULA=Y apt-get install -y msodbcsql17=17.10.4.1-1 \ - && DEBIAN_FRONTEND=noninteractive ACCEPT_EULA=Y apt-get install -y msodbcsql18=18.2.2.1-1 \ + && echo 'msodbcsql17 msodbcsql17/accept_eula select true' | debconf-set-selections \ + && ACCEPT_EULA=Y apt-get install -y msodbcsql17=17.10.4.1-1 \ + && echo 'msodbcsql18 msodbcsql18/accept_eula select true' | debconf-set-selections \ + && ACCEPT_EULA=Y apt-get install -y msodbcsql18=18.2.2.1-1 \ && ACCEPT_EULA=Y apt-get install -y mssql-tools18 \ && echo 'export PATH="$PATH:/opt/mssql-tools18/bin"' >> ~/.bashrc \ && source ~/.bashrc \ From 320eb9446e675335f9cfeb0793fbf75e3c29b3f5 Mon Sep 17 00:00:00 2001 From: Cormac McCarthy Date: Fri, 5 Jan 2024 11:06:22 -0500 Subject: [PATCH 4/4] Remove APT upgrade causing timeouts for downgraded packages --- images/runtime/python/install-dependencies.sh | 2 -- images/runtime/python/template.Dockerfile | 2 -- 2 files changed, 4 deletions(-) diff --git a/images/runtime/python/install-dependencies.sh b/images/runtime/python/install-dependencies.sh index 92db7c3114..1c51a6f64a 100755 --- a/images/runtime/python/install-dependencies.sh +++ b/images/runtime/python/install-dependencies.sh @@ -50,9 +50,7 @@ apt-get update \ apt-transport-https \ && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \ && locale-gen \ - && echo 'msodbcsql17 msodbcsql17/accept_eula select true' | debconf-set-selections \ && ACCEPT_EULA=Y apt-get install -y msodbcsql17=17.10.4.1-1 \ - && echo 'msodbcsql18 msodbcsql18/accept_eula select true' | debconf-set-selections \ && ACCEPT_EULA=Y apt-get install -y msodbcsql18=18.2.2.1-1 \ && ACCEPT_EULA=Y apt-get install -y mssql-tools18 \ && echo 'export PATH="$PATH:/opt/mssql-tools18/bin"' >> ~/.bashrc \ diff --git a/images/runtime/python/template.Dockerfile b/images/runtime/python/template.Dockerfile index fd6d952dc9..06fbaf2ebf 100644 --- a/images/runtime/python/template.Dockerfile +++ b/images/runtime/python/template.Dockerfile @@ -92,8 +92,6 @@ RUN pip install --upgrade pip \ && dpkg -i libffi6_3.2.1-9_amd64.deb \ && rm libffi6_3.2.1-9_amd64.deb; fi \ && ln -s /opt/startupcmdgen/startupcmdgen /usr/local/bin/oryx \ - && apt-get update \ - && apt-get upgrade --assume-yes \ && rm -rf /var/lib/apt/lists/* \ && rm -rf /tmp/oryx