Compare commits

...

12 Commits

Author SHA1 Message Date
Shao Yu-Lung (Allen)
6c8cb6dd85
Merge pull request #3333 from erikn69/patch-5
Trying to fix some tests
2022-12-22 17:31:53 +08:00
erikn69
e8432157b4 Fix protoc install 2022-12-21 14:50:19 -05:00
erikn69
ea1a91e9e1 Fix event module 2022-12-21 11:16:14 -05:00
Shao Yu-Lung (Allen)
2bb27c5b05
Merge pull request #3334 from Silassiai/install-intl
added intl install for php-worker
2022-12-21 21:03:16 +08:00
Silas de Rooy
05518b1a94 added intl install for php-worker 2022-12-20 12:22:06 +01:00
erikn69
1198badfe4 Fix tests 2022-12-19 15:13:25 -05:00
Shao Yu-Lung (Allen)
7d1fb0cd86
Merge pull request #3332 from bestlong/fix/elasticsearch
fix: ElasticSearch can't start issue
2022-12-17 00:32:04 +08:00
Shao Yu-Lung (Allen)
b683e0258e fix: ElasticSearch can't start issue 2022-12-17 00:29:15 +08:00
Shao Yu-Lung (Allen)
f44f2f4261
Merge pull request #3331 from bestlong/workspace-node
fix: workspace nvm install node
2022-12-16 22:54:16 +08:00
Shao Yu-Lung (Allen)
566eaa64ba nvm will handle npm global bin path 2022-12-16 21:40:24 +08:00
Shao Yu-Lung (Allen)
302ef140f6
Merge pull request #3330 from bestlong/php-worker-ldap-5.6-7.0-ssl
fix: php-worker ldap 5.6 7.0 ssl
2022-12-16 00:09:32 +08:00
Shao Yu-Lung (Allen)
5c9b8b708e fix: php-worker ldap 5.6 7.0 ssl 2022-12-15 23:41:32 +08:00
5 changed files with 37 additions and 17 deletions

View File

@ -212,7 +212,7 @@ WORKSPACE_PROTOC_VERSION=latest
WORKSPACE_INSTALL_MEMCACHED=true
WORKSPACE_INSTALL_EVENT=false
WORKSPACE_INSTALL_DNSUTILS=true
WORKSPACE_XDEBUG_PORT=9003
WORKSPACE_XDEBUG_PORT=9000
WORKSPACE_VITE_PORT=5173
### 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_INSTALL_DOCKER_CLIENT=false
PHP_FPM_DEFAULT_LOCALE=POSIX
PHP_FPM_XDEBUG_PORT=9003
PHP_FPM_XDEBUG_PORT=9000
PHP_FPM_INSTALL_EVENT=false
PHP_FPM_INSTALL_DNSUTILS=true
@ -332,6 +332,7 @@ PHP_WORKER_INSTALL_IMAP=false
PHP_WORKER_INSTALL_XMLRPC=false
PHP_WORKER_INSTALL_SSDB=false
PHP_WORKER_INSTALL_EVENT=false
PHP_WORKER_INSTALL_INTL=true
PHP_WORKER_PUID=1000
PHP_WORKER_PGID=1000

View File

@ -356,6 +356,7 @@ services:
- INSTALL_XMLRPC=${PHP_WORKER_INSTALL_XMLRPC}
- INSTALL_SSDB=${PHP_WORKER_INSTALL_SSDB}
- INSTALL_EVENT=${PHP_WORKER_INSTALL_EVENT}
- INSTALL_INTL=${PHP_WORKER_INSTALL_INTL}
- PUID=${PHP_WORKER_PUID}
- PGID=${PHP_WORKER_PGID}
- IMAGEMAGICK_VERSION=${PHP_WORKER_IMAGEMAGICK_VERSION}
@ -1038,6 +1039,8 @@ services:
- cluster.name=laradock-cluster
- node.name=laradock-node
- bootstrap.memory_lock=true
- xpack.security.enabled=false
- xpack.security.transport.ssl.enabled=false
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
- cluster.initial_master_nodes=laradock-node
ulimits:

View File

@ -1286,7 +1286,7 @@ RUN if [ ${INSTALL_DNSUTILS} = true ]; then \
# 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

@ -32,8 +32,13 @@ RUN apk --update add wget \
cyrus-sasl-dev \
libgsasl-dev \
oniguruma-dev \
openssl-dev \
supervisor
supervisor; \
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; \
@ -503,6 +508,18 @@ RUN set -xe; \
&& docker-php-ext-enable ssdb \
;fi
###########################################################################
# Intl:
###########################################################################
ARG INSTALL_INTL=false
RUN if [ ${INSTALL_INTL} = true ]; then \
apk add icu-dev && \
docker-php-ext-configure intl && \
docker-php-ext-install intl && \
docker-php-ext-enable intl \
;fi
############################################################################
## Event:

View File

@ -760,7 +760,6 @@ RUN if [ ${INSTALL_NODE} = true ]; then \
&& if [ ${INSTALL_NPM_ANGULAR_CLI} = true ]; then \
npm install -g @angular/cli \
;fi \
&& ln -s `npm bin --global` /home/laradock/.node-bin \
;fi
# Wouldn't execute when added to the RUN statement in the above block
@ -780,9 +779,6 @@ RUN if [ ${INSTALL_NODE} = true ]; then \
echo '[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # This loads nvm' >> ~/.bashrc \
;fi
# Add PATH for node
ENV PATH $PATH:/home/laradock/.node-bin
# Make it so the node modules can be executed with 'docker-compose exec'
# We'll create symbolic links into '/usr/local/bin'.
RUN if [ ${INSTALL_NODE} = true ]; then \
@ -985,7 +981,7 @@ ARG INSTALL_LARAVEL_ENVOY=false
RUN if [ ${INSTALL_LARAVEL_ENVOY} = true ]; then \
# 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 \
;fi
@ -1531,6 +1527,7 @@ ARG INSTALL_PROTOC=false
ARG PROTOC_VERSION
RUN if [ ${INSTALL_PROTOC} = true ]; then \
apt-get -yqq install sudo wget unzip && \
if [ ${PROTOC_VERSION} = "latest" ]; then \
REAL_PROTOC_VERSION=$(curl -s https://api.github.com/repos/protocolbuffers/protobuf/releases/latest | \
sed -nr 's/.*"tag_name":\s?"v(.+?)".*/\1/p'); \
@ -1538,10 +1535,10 @@ RUN if [ ${INSTALL_PROTOC} = true ]; then \
REAL_PROTOC_VERSION=${PROTOC_VERSION}; \
fi && \
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} && \
unzip -q -o /tmp/protoc.zip -d /usr/local bin/protoc && \
unzip -q -o /tmp/protoc.zip -d /usr/local 'include/*' && \
rm -f /tmp/protoc.zip && \
wget https://github.com/protocolbuffers/protobuf/releases/download/v${REAL_PROTOC_VERSION}/${PROTOC_ZIP} && \
unzip -q -o ${PROTOC_ZIP} -d /usr/local bin/protoc && \
unzip -q -o ${PROTOC_ZIP} -d /usr/local 'include/*' && \
rm -f ${PROTOC_ZIP} && \
chmod +x /usr/local/bin/protoc && \
chmod -R +r /usr/local/include/google \
;fi
@ -1759,8 +1756,10 @@ RUN set -eux; \
make &&\
make install &&\
rm /tmp/libevent.tar.gz &&\
echo "extension=sockets.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/sockets.ini && \
ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/sockets.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/20-sockets.ini && \
if [ ! -f /etc/php/${LARADOCK_PHP_VERSION}/mods-available/sockets.ini ]; then\
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 &&\
mkdir -p /tmp/event-php &&\
tar -C /tmp/event-php -zxvf /tmp/event.tar.gz --strip 1 &&\
@ -1771,7 +1770,7 @@ RUN set -eux; \
make install &&\
rm /tmp/event.tar.gz &&\
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' \
;fi