From 258ea23b6496437f8d0fa8db9fd9f89aad8dc396 Mon Sep 17 00:00:00 2001 From: Saqib S Date: Mon, 5 Apr 2021 10:36:54 +0500 Subject: [PATCH 1/3] Added Memcached dependency installation in workspace Dockerfile. --- workspace/Dockerfile | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/workspace/Dockerfile b/workspace/Dockerfile index 85fd25d..04221f6 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -1220,6 +1220,16 @@ RUN if [ ${INSTALL_TERRAFORM} = true ]; then \ && mv terraform /usr/local/bin \ && rm terraform_0.10.6_linux_amd64.zip \ ;fi + +########################################################################### +# Memcached Dependecies: +########################################################################### + +RUN if [ ${PHP_FPM_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 ########################################################################### From e13482195b7624f28f0064e07b93910c3d082b04 Mon Sep 17 00:00:00 2001 From: Saqib S Date: Mon, 5 Apr 2021 13:46:30 +0500 Subject: [PATCH 2/3] Added ARG for workspace Memcached --- docker-compose.yml | 1 + env-example | 1 + workspace/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 3fadfda..93cf6c1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -168,6 +168,7 @@ services: - INSTALL_PHPDECIMAL=${WORKSPACE_INSTALL_PHPDECIMAL} - PROTOC_VERSION=${WORKSPACE_PROTOC_VERSION} - INSTALL_DOCKER_CLIENT=${WORKSPACE_INSTALL_DOCKER_CLIENT} + - INSTALL_MEMCACHED=${WORKSPACE_INSTALL_MEMCACHED} - http_proxy - https_proxy - no_proxy diff --git a/env-example b/env-example index 9b71f67..39242cd 100644 --- a/env-example +++ b/env-example @@ -199,6 +199,7 @@ WORKSPACE_INSTALL_LNAV=false WORKSPACE_INSTALL_PROTOC=false WORKSPACE_INSTALL_PHPDECIMAL=false WORKSPACE_PROTOC_VERSION=latest +WORKSPACE_INSTALL_MEMCACHED=true ### PHP_FPM ############################################### diff --git a/workspace/Dockerfile b/workspace/Dockerfile index 04221f6..cceb0c5 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -1225,7 +1225,7 @@ RUN if [ ${INSTALL_TERRAFORM} = true ]; then \ # Memcached Dependecies: ########################################################################### -RUN if [ ${PHP_FPM_INSTALL_MEMCACHED} = true ]; then \ +RUN if [ ${WORKSPACE_INSTALL_MEMCACHED} = true ]; then \ apt-get -y install php${LARADOCK_PHP_VERSION}-igbinary \ && apt-get -y install php${LARADOCK_PHP_VERSION}-memcached \ ;fi From aa7a0e9a34bb2ad99b0d7fe1c6b16d1fba9bf448 Mon Sep 17 00:00:00 2001 From: Saqib S Date: Mon, 5 Apr 2021 18:26:49 +0500 Subject: [PATCH 3/3] Added ARG INSTALL_MEMCACHED as suggested by Allen. --- workspace/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/workspace/Dockerfile b/workspace/Dockerfile index cceb0c5..7c9d11c 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -1225,7 +1225,9 @@ RUN if [ ${INSTALL_TERRAFORM} = true ]; then \ # Memcached Dependecies: ########################################################################### -RUN if [ ${WORKSPACE_INSTALL_MEMCACHED} = true ]; then \ +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