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

Merge pull request #2932 from iamsaqibs/memcached-issue-with-php7.1 

Memcached not working in workspace with php 7.
This commit is contained in:
Shao Yu-Lung (Allen) 2021-04-05 23:56:46 +08:00 committed by GitHub
parent 4d3da8ffbf aa7a0e9a34
commit 4f190170da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docker-compose.yml
View File

@ -169,6 +169,7 @@ services:
- INSTALL_ZOOKEEPER=${WORKSPACE_INSTALL_ZOOKEEPER} - INSTALL_ZOOKEEPER=${WORKSPACE_INSTALL_ZOOKEEPER}
- PROTOC_VERSION=${WORKSPACE_PROTOC_VERSION} - PROTOC_VERSION=${WORKSPACE_PROTOC_VERSION}
- INSTALL_DOCKER_CLIENT=${WORKSPACE_INSTALL_DOCKER_CLIENT} - INSTALL_DOCKER_CLIENT=${WORKSPACE_INSTALL_DOCKER_CLIENT}
- INSTALL_MEMCACHED=${WORKSPACE_INSTALL_MEMCACHED}
- http_proxy - http_proxy
- https_proxy - https_proxy
- no_proxy - no_proxy

1
env-example
View File

@ -200,6 +200,7 @@ WORKSPACE_INSTALL_PROTOC=false
WORKSPACE_INSTALL_PHPDECIMAL=false WORKSPACE_INSTALL_PHPDECIMAL=false
WORKSPACE_INSTALL_ZOOKEEPER=false WORKSPACE_INSTALL_ZOOKEEPER=false
WORKSPACE_PROTOC_VERSION=latest WORKSPACE_PROTOC_VERSION=latest
WORKSPACE_INSTALL_MEMCACHED=true
### PHP_FPM ############################################### ### PHP_FPM ###############################################

12
workspace/Dockerfile
View File

@ -1221,6 +1221,18 @@ RUN if [ ${INSTALL_TERRAFORM} = true ]; then \
&& mv terraform /usr/local/bin \ && mv terraform /usr/local/bin \
&& rm terraform_0.10.6_linux_amd64.zip \ && rm terraform_0.10.6_linux_amd64.zip \
;fi ;fi
###########################################################################
# Memcached Dependecies:
###########################################################################
ARG INSTALL_MEMCACHED=false
RUN if [ ${INSTALL_MEMCACHED} = true ]; then \
apt-get -y install php${LARADOCK_PHP_VERSION}-igbinary \
&& apt-get -y install php${LARADOCK_PHP_VERSION}-memcached \
;fi
########################################################################### ###########################################################################
# pgsql client # pgsql client
########################################################################### ###########################################################################