Fix MS SQL ODBC links in docker images

Author: acelaya

Dockerfile

@@ -7,7 +7,7 @@ ENV SHLINK_RUNTIME=${SHLINK_RUNTIME}
 
 ENV USER_ID='1001'
 ENV PDO_SQLSRV_VERSION='5.12.0'
-ENV MS_ODBC_DOWNLOAD='7/6/d/76de322a-d860-4894-9945-f0cc5d6a45f8'
+ENV MS_ODBC_DOWNLOAD='fae28b9a-d880-42fd-9b98-d779f0fdd77f'
 ENV MS_ODBC_SQL_VERSION='18_18.5.1.1'
 ENV LC_ALL='C'
 

data/infra/frankenphp.Dockerfile

@@ -2,7 +2,7 @@ FROM dunglas/frankenphp:1-php8.5-alpine
 MAINTAINER Alejandro Celaya <[email protected]>
 
 ENV PDO_SQLSRV_VERSION='5.12.0'
-ENV MS_ODBC_DOWNLOAD='7/6/d/76de322a-d860-4894-9945-f0cc5d6a45f8'
+ENV MS_ODBC_DOWNLOAD='fae28b9a-d880-42fd-9b98-d779f0fdd77f'
 ENV MS_ODBC_SQL_VERSION='18_18.5.1.1'
 
 RUN apk update
@@ -27,18 +27,20 @@ RUN docker-php-ext-install zip
 RUN apk add --no-cache postgresql-dev
 RUN docker-php-ext-install pdo_pgsql
 
+COPY --from=ghcr.io/php/pie:bin /pie /usr/bin/pie
 RUN apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS linux-headers && \
     docker-php-ext-install sockets && \
+    pie install xdebug/xdebug && \
     apk del .phpize-deps
 RUN docker-php-ext-install bcmath
 
-# Install xdebug and sqlsrv driver
+# Install sqlsrv driver
 RUN apk add --update linux-headers && \
     wget https://download.microsoft.com/download/${MS_ODBC_DOWNLOAD}/msodbcsql${MS_ODBC_SQL_VERSION}-1_amd64.apk && \
     apk add --allow-untrusted msodbcsql${MS_ODBC_SQL_VERSION}-1_amd64.apk && \
     apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS unixodbc-dev && \
-    pecl install pdo_sqlsrv-${PDO_SQLSRV_VERSION} xdebug && \
-    docker-php-ext-enable pdo_sqlsrv xdebug && \
+    pecl install pdo_sqlsrv-${PDO_SQLSRV_VERSION} && \
+    docker-php-ext-enable pdo_sqlsrv && \
     apk del .phpize-deps && \
     rm msodbcsql${MS_ODBC_SQL_VERSION}-1_amd64.apk
 

data/infra/php.Dockerfile

@@ -3,7 +3,7 @@ MAINTAINER Alejandro Celaya <[email protected]>
 
 ENV APCU_VERSION='5.1.24'
 ENV PDO_SQLSRV_VERSION='5.12.0'
-ENV MS_ODBC_DOWNLOAD='7/6/d/76de322a-d860-4894-9945-f0cc5d6a45f8'
+ENV MS_ODBC_DOWNLOAD='fae28b9a-d880-42fd-9b98-d779f0fdd77f'
 ENV MS_ODBC_SQL_VERSION='18_18.5.1.1'
 
 RUN apk update
@@ -28,8 +28,10 @@ RUN docker-php-ext-install zip
 RUN apk add --no-cache postgresql-dev
 RUN docker-php-ext-install pdo_pgsql
 
+COPY --from=ghcr.io/php/pie:bin /pie /usr/bin/pie
 RUN apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS linux-headers && \
     docker-php-ext-install sockets && \
+    pie install xdebug/xdebug && \
     apk del .phpize-deps
 RUN docker-php-ext-install bcmath
 
@@ -43,13 +45,13 @@ RUN mkdir -p /usr/src/php/ext/apcu \
   && rm /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini \
   && echo extension=apcu.so > /usr/local/etc/php/conf.d/20-php-ext-apcu.ini
 
-# Install xdebug and sqlsrv driver
+# Install sqlsrv driver
 RUN apk add --update linux-headers && \
     wget https://download.microsoft.com/download/${MS_ODBC_DOWNLOAD}/msodbcsql${MS_ODBC_SQL_VERSION}-1_amd64.apk && \
     apk add --allow-untrusted msodbcsql${MS_ODBC_SQL_VERSION}-1_amd64.apk && \
     apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS unixodbc-dev && \
-    pecl install pdo_sqlsrv-${PDO_SQLSRV_VERSION} xdebug && \
-    docker-php-ext-enable pdo_sqlsrv xdebug && \
+    pecl install pdo_sqlsrv-${PDO_SQLSRV_VERSION} && \
+    docker-php-ext-enable pdo_sqlsrv && \
     apk del .phpize-deps && \
     rm msodbcsql${MS_ODBC_SQL_VERSION}-1_amd64.apk
 

data/infra/roadrunner.Dockerfile

@@ -2,7 +2,7 @@ FROM php:8.5-alpine3.22
 MAINTAINER Alejandro Celaya <[email protected]>
 
 ENV PDO_SQLSRV_VERSION='5.12.0'
-ENV MS_ODBC_DOWNLOAD='7/6/d/76de322a-d860-4894-9945-f0cc5d6a45f8'
+ENV MS_ODBC_DOWNLOAD='fae28b9a-d880-42fd-9b98-d779f0fdd77f'
 ENV MS_ODBC_SQL_VERSION='18_18.5.1.1'
 
 RUN apk update
@@ -27,18 +27,20 @@ RUN docker-php-ext-install zip
 RUN apk add --no-cache postgresql-dev
 RUN docker-php-ext-install pdo_pgsql
 
+COPY --from=ghcr.io/php/pie:bin /pie /usr/bin/pie
 RUN apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS linux-headers && \
     docker-php-ext-install sockets && \
+    pie install xdebug/xdebug && \
     apk del .phpize-deps
 RUN docker-php-ext-install bcmath
 
-# Install xdebug and sqlsrv driver
+# Install sqlsrv driver
 RUN apk add --update linux-headers && \
     wget https://download.microsoft.com/download/${MS_ODBC_DOWNLOAD}/msodbcsql${MS_ODBC_SQL_VERSION}-1_amd64.apk && \
     apk add --allow-untrusted msodbcsql${MS_ODBC_SQL_VERSION}-1_amd64.apk && \
     apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS unixodbc-dev && \
-    pecl install pdo_sqlsrv-${PDO_SQLSRV_VERSION} xdebug && \
-    docker-php-ext-enable pdo_sqlsrv xdebug && \
+    pecl install pdo_sqlsrv-${PDO_SQLSRV_VERSION} && \
+    docker-php-ext-enable pdo_sqlsrv && \
     apk del .phpize-deps && \
     rm msodbcsql${MS_ODBC_SQL_VERSION}-1_amd64.apk