From 5e4fda465982d60a09b801c8b4c738ebf810e352 Mon Sep 17 00:00:00 2001 From: Mahmoudz Date: Thu, 22 Aug 2019 09:53:30 +0200 Subject: [PATCH] replace the letsdockerize base images with the original once after creating tags for the images. Closing #26 #27 --- DOCUMENTATION/content/documentation/index.md | 1 - env-example | 4 ++-- php-fpm/Dockerfile | 3 +-- workspace/Dockerfile | 3 +-- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/DOCUMENTATION/content/documentation/index.md b/DOCUMENTATION/content/documentation/index.md index a9aeb8a..d83b442 100644 --- a/DOCUMENTATION/content/documentation/index.md +++ b/DOCUMENTATION/content/documentation/index.md @@ -250,7 +250,6 @@ docker-compose build php-fpm
## Change the PHP-CLI Version -By default **PHP-CLI 7.0** is running. >Note: it's not very essential to edit the PHP-CLI version. The PHP-CLI is only used for the Artisan Commands & Composer. It doesn't serve your Application code, this is the PHP-FPM job. diff --git a/env-example b/env-example index 0e80c21..76a4af3 100644 --- a/env-example +++ b/env-example @@ -38,7 +38,7 @@ COMPOSE_PROJECT_NAME=laradock ### PHP Version ########################################### # Select a PHP version of the Workspace and PHP-FPM containers (Does not apply to HHVM). Accepted values: 7.3 - 7.2 - 7.1 - 7.0 - 5.6 -PHP_VERSION=7.2 +PHP_VERSION=7.3 ### Phalcon Version ########################################### @@ -770,4 +770,4 @@ CASSANDRA_ENABLE_RPC=true # Datacenter name for the cluster. Ignored in SimpleSnitch endpoint snitch. Default: dc1. CASSANDRA_DATACENTER=dc1 # Rack name for the cluster. Ignored in SimpleSnitch endpoint snitch. Default: rack1. -CASSANDRA_RACK=rack1 \ No newline at end of file +CASSANDRA_RACK=rack1 diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index 9d8b9b2..27dcec7 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -14,8 +14,7 @@ ARG LARADOCK_PHP_VERSION -# FROM laradock/php-fpm:2.2-${LARADOCK_PHP_VERSION} -FROM letsdockerize/laradock-php-fpm:2.4.1-${LARADOCK_PHP_VERSION} +FROM laradock/php-fpm:2.5-${LARADOCK_PHP_VERSION} LABEL maintainer="Mahmoud Zalt " diff --git a/workspace/Dockerfile b/workspace/Dockerfile index f41f163..0fd26b6 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -14,8 +14,7 @@ ARG LARADOCK_PHP_VERSION -# FROM laradock/workspace:2.2-${LARADOCK_PHP_VERSION} -FROM letsdockerize/laradock-workspace:2.4-${LARADOCK_PHP_VERSION} +FROM laradock/workspace:2.5-${LARADOCK_PHP_VERSION} LABEL maintainer="Mahmoud Zalt "