From c761c89176a968129f7d9cad8fdffc94a70e03b6 Mon Sep 17 00:00:00 2001 From: Leonid Makarov Date: Fri, 9 Feb 2024 11:13:32 +0100 Subject: [PATCH] MS ODBC driver repo and key --- 8.1/Dockerfile | 8 +++----- 8.2/Dockerfile | 8 +++----- 8.3/Dockerfile | 8 +++----- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/8.1/Dockerfile b/8.1/Dockerfile index 66e6e3e1..a31a0102 100644 --- a/8.1/Dockerfile +++ b/8.1/Dockerfile @@ -208,11 +208,9 @@ RUN set -xe; \ # MSSQL PHP client RUN set -xe; \ - # Repo for msodbcsql18 (MS ODBC driver), required by pecl/sqlsrv and pecl/pdo_sqlsrv - curl -fsSL https://packages.microsoft.com/keys/microsoft.asc | apt-key add -; \ - # TODO: Using Ubuntu 22.04 packages as a temporary fix (until addressed upstream in MS repos). - #curl -fsSL https://packages.microsoft.com/config/debian/12/prod.list -o /etc/apt/sources.list.d/mssql.list; \ - curl -fsSL https://packages.microsoft.com/config/ubuntu/22.04/prod.list -o /etc/apt/sources.list.d/mssql.list; \ + # Repo and key for msodbcsql18 (MS ODBC driver), required by pecl/sqlsrv and pecl/pdo_sqlsrv + curl -fsSL https://packages.microsoft.com/config/debian/12/prod.list -o /etc/apt/sources.list.d/mssql.list; \ + curl -fsSL https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor -o /usr/share/keyrings/microsoft-prod.gpg; \ \ buildDeps=" \ unixodbc-dev \ diff --git a/8.2/Dockerfile b/8.2/Dockerfile index 6e81368f..b8be9313 100644 --- a/8.2/Dockerfile +++ b/8.2/Dockerfile @@ -209,11 +209,9 @@ RUN set -xe; \ # MSSQL PHP client RUN set -xe; \ - # Repo for msodbcsql18 (MS ODBC driver), required by pecl/sqlsrv and pecl/pdo_sqlsrv - curl -fsSL https://packages.microsoft.com/keys/microsoft.asc | apt-key add -; \ - # TODO: Using Ubuntu 22.04 packages as a temporary fix (until addressed upstream in MS repos). - #curl -fsSL https://packages.microsoft.com/config/debian/12/prod.list -o /etc/apt/sources.list.d/mssql.list; \ - curl -fsSL https://packages.microsoft.com/config/ubuntu/22.04/prod.list -o /etc/apt/sources.list.d/mssql.list; \ + # Repo and key for msodbcsql18 (MS ODBC driver), required by pecl/sqlsrv and pecl/pdo_sqlsrv + curl -fsSL https://packages.microsoft.com/config/debian/12/prod.list -o /etc/apt/sources.list.d/mssql.list; \ + curl -fsSL https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor -o /usr/share/keyrings/microsoft-prod.gpg; \ \ buildDeps=" \ unixodbc-dev \ diff --git a/8.3/Dockerfile b/8.3/Dockerfile index b6eac01e..831c537f 100644 --- a/8.3/Dockerfile +++ b/8.3/Dockerfile @@ -211,11 +211,9 @@ RUN set -xe; \ # MSSQL PHP client RUN set -xe; \ - # Repo for msodbcsql18 (MS ODBC driver), required by pecl/sqlsrv and pecl/pdo_sqlsrv - curl -fsSL https://packages.microsoft.com/keys/microsoft.asc | apt-key add -; \ - # TODO: Using Ubuntu 22.04 packages as a temporary fix (until addressed upstream in MS repos). - #curl -fsSL https://packages.microsoft.com/config/debian/12/prod.list -o /etc/apt/sources.list.d/mssql.list; \ - curl -fsSL https://packages.microsoft.com/config/ubuntu/22.04/prod.list -o /etc/apt/sources.list.d/mssql.list; \ + # Repo and key for msodbcsql18 (MS ODBC driver), required by pecl/sqlsrv and pecl/pdo_sqlsrv + curl -fsSL https://packages.microsoft.com/config/debian/12/prod.list -o /etc/apt/sources.list.d/mssql.list; \ + curl -fsSL https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor -o /usr/share/keyrings/microsoft-prod.gpg; \ \ buildDeps=" \ unixodbc-dev \