From 891911ddc317a4823e34f8fd1ebe87b2f55a6245 Mon Sep 17 00:00:00 2001 From: calebfavor Date: Mon, 17 Oct 2016 14:17:23 -0700 Subject: [PATCH 1/2] Removing double quotes for apache php fpm configuration. --- apache2/Dockerfile | 2 +- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apache2/Dockerfile b/apache2/Dockerfile index 7ee9b855..4bb4fa01 100644 --- a/apache2/Dockerfile +++ b/apache2/Dockerfile @@ -2,7 +2,7 @@ FROM webdevops/apache:ubuntu-16.04 MAINTAINER Eric Pfeiffer -ARG PHP_SOCKET="php-fpm:9000" +ARG PHP_SOCKET=$PHP_SOCKET ENV WEB_PHP_SOCKET=$PHP_SOCKET diff --git a/docker-compose.yml b/docker-compose.yml index bb00811c..08d2e7f2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -78,7 +78,7 @@ services: build: context: ./apache2 args: - - PHP_SOCKET="php-fpm:9000" + - PHP_SOCKET=php-fpm:9000 volumes_from: - volumes_source volumes: From 91bae765276e84d0908fe3f90ef030e16647f5d7 Mon Sep 17 00:00:00 2001 From: calebfavor Date: Mon, 17 Oct 2016 16:05:35 -0700 Subject: [PATCH 2/2] No longer using env variable to set the apache php socket config variable. --- apache2/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache2/Dockerfile b/apache2/Dockerfile index 4bb4fa01..dd1a9d17 100644 --- a/apache2/Dockerfile +++ b/apache2/Dockerfile @@ -2,7 +2,7 @@ FROM webdevops/apache:ubuntu-16.04 MAINTAINER Eric Pfeiffer -ARG PHP_SOCKET=$PHP_SOCKET +ARG PHP_SOCKET=php-fpm:9000 ENV WEB_PHP_SOCKET=$PHP_SOCKET