Merge pull request #3333 from erikn69/patch-5

Trying to fix some tests
This commit is contained in:
Shao Yu-Lung (Allen) 2022-12-22 17:31:53 +08:00 committed by GitHub
commit 6c8cb6dd85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 11 deletions

View File

@ -212,7 +212,7 @@ WORKSPACE_PROTOC_VERSION=latest
WORKSPACE_INSTALL_MEMCACHED=true WORKSPACE_INSTALL_MEMCACHED=true
WORKSPACE_INSTALL_EVENT=false WORKSPACE_INSTALL_EVENT=false
WORKSPACE_INSTALL_DNSUTILS=true WORKSPACE_INSTALL_DNSUTILS=true
WORKSPACE_XDEBUG_PORT=9003 WORKSPACE_XDEBUG_PORT=9000
WORKSPACE_VITE_PORT=5173 WORKSPACE_VITE_PORT=5173
### PHP_FPM ############################################### ### PHP_FPM ###############################################
@ -285,7 +285,7 @@ PHP_FPM_AUDIOWAVEFORM=false
PHP_FPM_ADDITIONAL_LOCALES="en_US.UTF-8 es_ES.UTF-8 fr_FR.UTF-8" PHP_FPM_ADDITIONAL_LOCALES="en_US.UTF-8 es_ES.UTF-8 fr_FR.UTF-8"
PHP_FPM_INSTALL_DOCKER_CLIENT=false PHP_FPM_INSTALL_DOCKER_CLIENT=false
PHP_FPM_DEFAULT_LOCALE=POSIX PHP_FPM_DEFAULT_LOCALE=POSIX
PHP_FPM_XDEBUG_PORT=9003 PHP_FPM_XDEBUG_PORT=9000
PHP_FPM_INSTALL_EVENT=false PHP_FPM_INSTALL_EVENT=false
PHP_FPM_INSTALL_DNSUTILS=true PHP_FPM_INSTALL_DNSUTILS=true

View File

@ -1286,7 +1286,7 @@ RUN if [ ${INSTALL_DNSUTILS} = true ]; then \
# Check PHP version: # Check PHP version:
########################################################################### ###########################################################################
RUN set -xe; php -v | head -n 1 | grep -q "PHP ${LARADOCK_PHP_VERSION}." RUN set -xe; php -v | grep -q "PHP ${LARADOCK_PHP_VERSION}."
# #
#-------------------------------------------------------------------------- #--------------------------------------------------------------------------

View File

@ -981,7 +981,7 @@ ARG INSTALL_LARAVEL_ENVOY=false
RUN if [ ${INSTALL_LARAVEL_ENVOY} = true ]; then \ RUN if [ ${INSTALL_LARAVEL_ENVOY} = true ]; then \
# Install the Laravel Envoy # Install the Laravel Envoy
composer config --no-plugins allow-plugins.kylekatarnls/update-helper true && \ composer global config --no-plugins allow-plugins.kylekatarnls/update-helper true && \
composer global require laravel/envoy \ composer global require laravel/envoy \
;fi ;fi
@ -1527,6 +1527,7 @@ ARG INSTALL_PROTOC=false
ARG PROTOC_VERSION ARG PROTOC_VERSION
RUN if [ ${INSTALL_PROTOC} = true ]; then \ RUN if [ ${INSTALL_PROTOC} = true ]; then \
apt-get -yqq install sudo wget unzip && \
if [ ${PROTOC_VERSION} = "latest" ]; then \ if [ ${PROTOC_VERSION} = "latest" ]; then \
REAL_PROTOC_VERSION=$(curl -s https://api.github.com/repos/protocolbuffers/protobuf/releases/latest | \ REAL_PROTOC_VERSION=$(curl -s https://api.github.com/repos/protocolbuffers/protobuf/releases/latest | \
sed -nr 's/.*"tag_name":\s?"v(.+?)".*/\1/p'); \ sed -nr 's/.*"tag_name":\s?"v(.+?)".*/\1/p'); \
@ -1534,10 +1535,10 @@ RUN if [ ${INSTALL_PROTOC} = true ]; then \
REAL_PROTOC_VERSION=${PROTOC_VERSION}; \ REAL_PROTOC_VERSION=${PROTOC_VERSION}; \
fi && \ fi && \
PROTOC_ZIP=protoc-${REAL_PROTOC_VERSION}-linux-x86_64.zip; \ PROTOC_ZIP=protoc-${REAL_PROTOC_VERSION}-linux-x86_64.zip; \
curl -L -o /tmp/protoc.zip https://github.com/protocolbuffers/protobuf/releases/download/v${REAL_PROTOC_VERSION}/${PROTOC_ZIP} && \ wget https://github.com/protocolbuffers/protobuf/releases/download/v${REAL_PROTOC_VERSION}/${PROTOC_ZIP} && \
unzip -q -o /tmp/protoc.zip -d /usr/local bin/protoc && \ unzip -q -o ${PROTOC_ZIP} -d /usr/local bin/protoc && \
unzip -q -o /tmp/protoc.zip -d /usr/local 'include/*' && \ unzip -q -o ${PROTOC_ZIP} -d /usr/local 'include/*' && \
rm -f /tmp/protoc.zip && \ rm -f ${PROTOC_ZIP} && \
chmod +x /usr/local/bin/protoc && \ chmod +x /usr/local/bin/protoc && \
chmod -R +r /usr/local/include/google \ chmod -R +r /usr/local/include/google \
;fi ;fi
@ -1755,8 +1756,10 @@ RUN set -eux; \
make &&\ make &&\
make install &&\ make install &&\
rm /tmp/libevent.tar.gz &&\ rm /tmp/libevent.tar.gz &&\
echo "extension=sockets.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/sockets.ini && \ if [ ! -f /etc/php/${LARADOCK_PHP_VERSION}/mods-available/sockets.ini ]; then\
ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/sockets.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/20-sockets.ini && \ echo "extension=sockets.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/sockets.ini; \
fi &&\
ln -sf /etc/php/${LARADOCK_PHP_VERSION}/mods-available/sockets.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/20-sockets.ini && \
curl -L -o /tmp/event.tar.gz http://pecl.php.net/get/event-3.0.6.tgz &&\ curl -L -o /tmp/event.tar.gz http://pecl.php.net/get/event-3.0.6.tgz &&\
mkdir -p /tmp/event-php &&\ mkdir -p /tmp/event-php &&\
tar -C /tmp/event-php -zxvf /tmp/event.tar.gz --strip 1 &&\ tar -C /tmp/event-php -zxvf /tmp/event.tar.gz --strip 1 &&\
@ -1767,7 +1770,7 @@ RUN set -eux; \
make install &&\ make install &&\
rm /tmp/event.tar.gz &&\ rm /tmp/event.tar.gz &&\
echo "extension=event.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/event.ini && \ echo "extension=event.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/event.ini && \
ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/event.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/20-event.ini && \ ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/event.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/30-event.ini && \
php -m | grep -q 'event' \ php -m | grep -q 'event' \
;fi ;fi