Merge pull request #2246 from laradock/tagging-base-images
Use the original base images after tagging PHP 7.3
This commit is contained in:
commit
cb910c590e
@ -250,7 +250,6 @@ docker-compose build php-fpm
|
||||
<br>
|
||||
<a name="Change-the-PHP-CLI-Version"></a>
|
||||
## 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.
|
||||
|
||||
|
@ -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
|
||||
CASSANDRA_RACK=rack1
|
||||
|
@ -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 <mahmoud@zalt.me>"
|
||||
|
||||
|
@ -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 <mahmoud@zalt.me>"
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user