davidl/laradock
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3666 from erikn69/patch-37

Browse Source 
Test fixes(archive.debian php 7.1,7.2, MSSQL, IMAP, python3, DUSK)
This commit is contained in:
Shao Yu-Lung (Allen)
2025-12-20 22:48:37 +08:00
committed by GitHub
parent 1cb85dddde 3d8fb2a500
commit fcdd1b20fa
2 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
php-fpm/Dockerfile
View File

@@ -33,6 +33,14 @@ RUN if [ ${CHANGE_SOURCE} = true ]; then \
sed -i 's/security-cdn.debian.org/mirrors.tuna.tsinghua.edu.cn/' /etc/apt/sources.list \
;fi
RUN if [ "$LARADOCK_PHP_VERSION" = "7.1" ] || [ ${LARADOCK_PHP_VERSION} = "7.2" ]; then \
sed -i \
-e 's|deb.debian.org|archive.debian.org|g' \
-e 's|security.debian.org|archive.debian.org|g' \
-e '/buster-updates/d' \
/etc/apt/sources.list; \
fi
# always run apt update when start and after add new source list, then clean up at end.
RUN set -xe; \
apt-get update -yqq && \
@@ -781,7 +789,7 @@ RUN set -eux; \
;else \
curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \
;fi \
&& curl https://packages.microsoft.com/config/debian/$(lsb_release -rs)/prod.list > /etc/apt/sources.list.d/mssql-release.list \
&& curl https://packages.microsoft.com/config/debian/$(if [ "$(lsb_release -rs)" = "13" ]; then echo "12"; else lsb_release -rs; fi)/prod.list > /etc/apt/sources.list.d/mssql-release.list \
&& apt-get update -yqq \
&& ACCEPT_EULA=Y apt-get install -yqq unixodbc unixodbc-dev libgss3 odbcinst msodbcsql18 locales \
&& echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \
@@ -799,6 +807,8 @@ RUN set -eux; \
pecl install pdo_sqlsrv-5.10.1 sqlsrv-5.10.1 \
;elif [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "80000" ]; then \
pecl install pdo_sqlsrv-5.11.1 sqlsrv-5.11.1 \
;elif [ $(php -r "echo PHP_MAJOR_VERSION;") = 8 ] && [ $(php -r "echo PHP_MINOR_VERSION;") -le 3 ]; then \
pecl install pdo_sqlsrv-5.12.0 sqlsrv-5.12.0 \
;else \
pecl install pdo_sqlsrv sqlsrv \
;fi \
@@ -875,12 +885,12 @@ RUN if [ ${INSTALL_SMB} = true ]; then \
ARG INSTALL_IMAP=false
RUN if [ "$INSTALL_IMAP" = "true" ] \
&& [ "$LARADOCK_PHP_VERSION" != "8.4" ] \
&& [ "$LARADOCK_PHP_VERSION" != "8.5" ]; then \
RUN if [ "$INSTALL_IMAP" = "true" ]; then \
if [ "$(lsb_release -rs)" != "13" ]; then \
apt-get install -yqq libc-client-dev libkrb5-dev && \
docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \
docker-php-ext-install imap; \
fi; \
fi
###########################################################################

12
workspace/Dockerfile
View File

@@ -1142,7 +1142,7 @@ RUN set -eux; \
# https://github.com/Microsoft/msphpsql/wiki/Install-and-configuration
###########################################################################
curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - && \
curl https://packages.microsoft.com/config/ubuntu/$(lsb_release -rs)/prod.list > /etc/apt/sources.list.d/mssql-release.list && \
curl https://packages.microsoft.com/config/ubuntu/$( [ "$(lsb_release -rs)" = "24.04" ] && echo 22.04 || lsb_release -rs )/prod.list > /etc/apt/sources.list.d/mssql-release.list && \
apt-get update -yqq && \
ACCEPT_EULA=Y apt-get install -yqq msodbcsql18 mssql-tools18 unixodbc unixodbc-dev libgss3 odbcinst locales && \
ln -sfn /opt/mssql-tools/bin/sqlcmd /usr/bin/sqlcmd && \
@@ -1161,6 +1161,8 @@ RUN set -eux; \
pecl install pdo_sqlsrv-5.10.1 sqlsrv-5.10.1 \
;elif [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "80000" ]; then \
pecl install pdo_sqlsrv-5.11.1 sqlsrv-5.11.1 \
;elif [ $(php -r "echo PHP_MAJOR_VERSION;") = 8 ] && [ $(php -r "echo PHP_MINOR_VERSION;") -le 3 ]; then \
pecl install pdo_sqlsrv-5.12.0 sqlsrv-5.12.0 \
;else \
pecl install pdo_sqlsrv sqlsrv \
;fi && \
@@ -1243,10 +1245,10 @@ ARG INSTALL_PYTHON3=false
RUN if [ ${INSTALL_PYTHON3} = true ]; then \
apt-get -y install python3 python3-dev build-essential \
&& curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
&& python3 get-pip.py \
&& python3 get-pip.py --break-system-packages \
&& rm get-pip.py \
&& python3 -m pip install --upgrade --force-reinstall pip \
&& python3 -m pip install --upgrade virtualenv \
&& python3 -m pip install --upgrade --force-reinstall pip --break-system-packages \
&& python3 -m pip install --upgrade virtualenv --break-system-packages \
;fi
###########################################################################
@@ -1371,7 +1373,7 @@ ARG INSTALL_DUSK_DEPS=false
RUN if [ ${INSTALL_DUSK_DEPS} = true ]; then \
apt-get -y install zip wget unzip xdg-utils \
libxpm4 libxrender1 libgtk2.0-0 libnss3 libgconf-2-4 xvfb \
libxpm4 libxrender1 libgtk2.0-0 libnss3 xvfb \
gtk2-engines-pixbuf xfonts-cyrillic xfonts-100dpi xfonts-75dpi \
xfonts-base xfonts-scalable x11-apps \
fonts-ipafont \