From 4edf9418720494096e010d0d09f81482f2e173bf Mon Sep 17 00:00:00 2001 From: Mahmoud Zalt Date: Wed, 18 May 2016 02:43:23 +0300 Subject: [PATCH] rename php to php-fpm preparing to add php cli as part of the workspace container --- docker-compose.yml | 8 ++++---- php/Dockerfile-php-55 => php-fpm/Dockerfile-55 | 0 php/Dockerfile-php-56 => php-fpm/Dockerfile-56 | 0 php/Dockerfile-php-70 => php-fpm/Dockerfile-70 | 0 {php => php-fpm}/laravel.ini | 0 {php => php-fpm}/laravel.pool.conf | 0 6 files changed, 4 insertions(+), 4 deletions(-) rename php/Dockerfile-php-55 => php-fpm/Dockerfile-55 (100%) rename php/Dockerfile-php-56 => php-fpm/Dockerfile-56 (100%) rename php/Dockerfile-php-70 => php-fpm/Dockerfile-70 (100%) rename {php => php-fpm}/laravel.ini (100%) rename {php => php-fpm}/laravel.pool.conf (100%) diff --git a/docker-compose.yml b/docker-compose.yml index 549458d1..50cb5e21 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,12 +15,12 @@ services: links: - php -### PHP Container ########################################### +### PHP-FPM Container ####################################### - php: + php-fpm: build: - context: ./php - dockerfile: Dockerfile-php-70 + context: ./php-fpm + dockerfile: Dockerfile-70 volumes: - ../:/var/www/laravel - ./logs/php/:/usr/local/var/log diff --git a/php/Dockerfile-php-55 b/php-fpm/Dockerfile-55 similarity index 100% rename from php/Dockerfile-php-55 rename to php-fpm/Dockerfile-55 diff --git a/php/Dockerfile-php-56 b/php-fpm/Dockerfile-56 similarity index 100% rename from php/Dockerfile-php-56 rename to php-fpm/Dockerfile-56 diff --git a/php/Dockerfile-php-70 b/php-fpm/Dockerfile-70 similarity index 100% rename from php/Dockerfile-php-70 rename to php-fpm/Dockerfile-70 diff --git a/php/laravel.ini b/php-fpm/laravel.ini similarity index 100% rename from php/laravel.ini rename to php-fpm/laravel.ini diff --git a/php/laravel.pool.conf b/php-fpm/laravel.pool.conf similarity index 100% rename from php/laravel.pool.conf rename to php-fpm/laravel.pool.conf