...
 
Commits (6)
    https://gitcode.net/awesome-mirrors/laradock/laradock/-/commit/2e5da396a056b4cba4bbd48442bc9cdfa0179b24 add ipafont on Dusk Dependencies section 2023-04-14T05:44:08+09:00 phantomboyA phantomboyA@gmail.com https://gitcode.net/awesome-mirrors/laradock/laradock/-/commit/c776c33645803c56c07f96479c170998e536c0d3 fix: laravel-horizon SSL 2023-04-14T21:02:30+01:00 Tom Robertshaw tom.robertshaw@space48.com https://gitcode.net/awesome-mirrors/laradock/laradock/-/commit/520c9303b1fb9ce540a6addeaf1c24876b2cb46e Update xdebug version 2023-04-21T12:55:10+03:00 Pavel Bychko box@abordage.dev https://gitcode.net/awesome-mirrors/laradock/laradock/-/commit/70bfdf0b055b8983ef1b38b7ceb82681aed699c7 Merge pull request #3376 from bobbyshaw/fix/laravel-horizon-postgres-build 2023-04-30T23:34:44+08:00 Shao Yu-Lung (Allen) bestlong168@gmail.com fix: laravel-horizon SSL https://gitcode.net/awesome-mirrors/laradock/laradock/-/commit/94af63fbc5cd334de27e7364c9e0f637adb1d91e Merge pull request #3378 from abordage/update-xdebug 2023-04-30T23:43:24+08:00 Shao Yu-Lung (Allen) bestlong168@gmail.com Update xdebug version https://gitcode.net/awesome-mirrors/laradock/laradock/-/commit/baa65a6e9e835f049654939bc7989f0fcd1f18dc Merge pull request #3373 from phantomboyA/feat-add-ipafont 2023-04-30T23:44:38+08:00 Shao Yu-Lung (Allen) bestlong168@gmail.com add ipafont on Dusk Dependencies section
......@@ -31,10 +31,14 @@ RUN apk --update add wget \
cyrus-sasl-dev \
libgsasl-dev \
oniguruma-dev \
libressl \
libressl-dev \
supervisor \
procps
procps; \
if [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "50600" ] || \
[ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70000" ]; then \
apk --update add libressl libressl-dev; \
else \
apk --update add openssl-dev; \
fi
RUN pecl channel-update pecl.php.net; \
docker-php-ext-install mysqli mbstring pdo pdo_mysql xml pcntl; \
......
......@@ -219,10 +219,10 @@ RUN if [ ${INSTALL_XDEBUG} = true ]; then \
# Install the xdebug extension
# https://xdebug.org/docs/compat
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ] || { [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && { [ $(php -r "echo PHP_MINOR_VERSION;") = "4" ] || [ $(php -r "echo PHP_MINOR_VERSION;") = "3" ] ;} ;}; then \
if [ ${LARADOCK_PHP_VERSION} = "8.2" ]; then \
pecl install xdebug-3.2.0; \
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \
pecl install xdebug-3.2.1; \
else \
pecl install xdebug-3.1.4; \
pecl install xdebug-3.1.6; \
fi; \
else \
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
......
......@@ -343,10 +343,10 @@ RUN if [ ${INSTALL_XDEBUG} = true ]; then \
# https://xdebug.org/docs/compat
apt-get install -yqq pkg-config php-xml php${LARADOCK_PHP_VERSION}-xml && \
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ] || { [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && { [ $(php -r "echo PHP_MINOR_VERSION;") = "4" ] || [ $(php -r "echo PHP_MINOR_VERSION;") = "3" ] ;} ;}; then \
if [ ${LARADOCK_PHP_VERSION} = "8.2" ]; then \
pecl install xdebug-3.2.0; \
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \
pecl install xdebug-3.2.1; \
else \
pecl install xdebug-3.1.4; \
pecl install xdebug-3.1.6; \
fi; \
else \
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
......@@ -1324,6 +1324,7 @@ RUN if [ ${INSTALL_DUSK_DEPS} = true ]; then \
libxpm4 libxrender1 libgtk2.0-0 libnss3 libgconf-2-4 xvfb \
gtk2-engines-pixbuf xfonts-cyrillic xfonts-100dpi xfonts-75dpi \
xfonts-base xfonts-scalable x11-apps \
fonts-ipafont \
&& wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb \
&& dpkg -i --force-depends google-chrome-stable_current_amd64.deb \
&& apt-get -y -f install \
......