update base image (#2034 )

Update index.md (#1531 )
Docker-compose is installed on a Digital Ocean Docker Image already
2019-03-03 20:57:07 +08:00 · 2019-03-02 12:50:52 +08:00 · 2019-03-01 18:24:14 +08:00 · 2019-03-01 15:48:23 +08:00
9 changed files with 3312 additions and 10 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -11,11 +11,13 @@ env:
    - PHP_VERSION=7.0 BUILD_SERVICE=workspace
    - PHP_VERSION=7.1 BUILD_SERVICE=workspace
    - PHP_VERSION=7.2 BUILD_SERVICE=workspace
+    - PHP_VERSION=7.3 BUILD_SERVICE=workspace

    - PHP_VERSION=5.6 BUILD_SERVICE=php-fpm
    - PHP_VERSION=7.0 BUILD_SERVICE=php-fpm
    - PHP_VERSION=7.1 BUILD_SERVICE=php-fpm
    - PHP_VERSION=7.2 BUILD_SERVICE=php-fpm
+    - PHP_VERSION=7.3 BUILD_SERVICE=php-fpm

    - PHP_VERSION=hhvm BUILD_SERVICE=hhvm

@ -23,6 +25,7 @@ env:
    - PHP_VERSION=7.0 BUILD_SERVICE=php-worker
    - PHP_VERSION=7.1 BUILD_SERVICE=php-worker
    - PHP_VERSION=7.2 BUILD_SERVICE=php-worker
+    - PHP_VERSION=7.3 BUILD_SERVICE=php-worker

    - PHP_VERSION=NA BUILD_SERVICE=solr
    - PHP_VERSION=NA BUILD_SERVICE="mssql rethinkdb aerospike"
--- a/DOCUMENTATION/content/guides/index.md
+++ b/DOCUMENTATION/content/guides/index.md
@ -50,12 +50,6 @@ $root@server:~/laravel/ git submodule add https://github.com/Laradock/laradock.g
 $root@server:~/laravel/ cd laradock
 ```

-## Install docker-compose command
-
-```
-$root@server:~/laravel/laradock# curl -L https://github.com/docker/compose/releases/download/1.8.0/run.sh > /usr/local/bin/docker-compose
-$root@server:~/chmod +x /usr/local/bin/docker-compose
-```
 ##  Enter the laradock folder and rename env-example to .env.
 ```
 $root@server:~/laravel/laradock# cp env-example .env
--- a/DOCUMENTATION/content/introduction/index.md
+++ b/DOCUMENTATION/content/introduction/index.md
@ -58,7 +58,7 @@ That's it! enjoy :)
 <a name="features"></a>
 ## Features

- Easy switch between PHP versions: 7.2, 7.1, 5.6...
+- Easy switch between PHP versions: 7.3, 7.2, 7.1, 5.6...
 - Choose your favorite database engine: MySQL, Postgres, MariaDB...
 - Run your own combination of software: Memcached, HHVM, Beanstalkd...
 - Every software runs on a separate container: PHP-FPM, NGINX, PHP-CLI...
--- a/2
+++ b/2
@ -37,7 +37,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.2 - 7.1 - 7.0 - 5.6
+# 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

 ### Phalcon Version ###########################################
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@ -15,7 +15,7 @@
 ARG LARADOCK_PHP_VERSION

 # FROM laradock/php-fpm:2.2-${LARADOCK_PHP_VERSION}
-FROM letsdockerize/laradock-php-fpm:2.3-${LARADOCK_PHP_VERSION}
+FROM letsdockerize/laradock-php-fpm:2.4-${LARADOCK_PHP_VERSION}

 LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"

--- a/php-fpm/php7.3.ini
+++ b/php-fpm/php7.3.ini
--- a/redis/redis.conf
+++ b/redis/redis.conf
--- a/travis-build.sh
+++ b/travis-build.sh
@ -20,6 +20,16 @@ if [ -n "${PHP_VERSION}" ]; then
        # https://github.com/aerospike/aerospike-client-php5/issues/145
        sed -i -- 's/PHP_FPM_INSTALL_AEROSPIKE=true/PHP_FPM_INSTALL_AEROSPIKE=false/g' .env
    fi
+    if [ "${PHP_VERSION}" == "7.3" ]; then
+        # V8JS extension does not yet support PHP 7.3.
+        sed -i -- 's/WORKSPACE_INSTALL_V8JS=true/WORKSPACE_INSTALL_V8JS=false/g' .env
+        # This ssh2 extension does not yet support PHP 7.3.
+        sed -i -- 's/PHP_FPM_INSTALL_SSH2=true/PHP_FPM_INSTALL_SSH2=false/g' .env
+        # xdebug extension does not yet support PHP 7.3.
+        sed -i -- 's/PHP_FPM_INSTALL_XDEBUG=true/PHP_FPM_INSTALL_XDEBUG=false/g' .env
+        # memcached extension does not yet support PHP 7.3.
+        sed -i -- 's/PHP_FPM_INSTALL_MEMCACHED=true/PHP_FPM_INSTALL_MEMCACHED=false/g' .env
+    fi
    cat .env
    docker-compose build ${BUILD_SERVICE}
    docker images
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@ -15,7 +15,7 @@
 ARG LARADOCK_PHP_VERSION

 # FROM laradock/workspace:2.2-${LARADOCK_PHP_VERSION}
-FROM letsdockerize/laradock-workspace:2.3-${LARADOCK_PHP_VERSION}
+FROM letsdockerize/laradock-workspace:2.4-${LARADOCK_PHP_VERSION}

 LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"
Author	SHA1	Message	Date
Shao Yu-Lung (Allen)	329462a637	update base image (#2034 )	2019-03-03 20:57:07 +08:00
Jasper Frumau	e105ec9569	Update index.md (#1531 ) Docker-compose is installed on a Digital Ocean Docker Image already	2019-03-02 12:50:52 +08:00
Shao Yu-Lung (Allen)	76218808fd	Support PHP 7.3 (#2028 ) * Support PHP 7.3 * travics-ci build test by pass: * SSH2 extension does not yet support PHP 7.3 * V8JS extension does not yet support PHP 7.3. * xdebug extension does not yet support PHP 7.3. * memcached extension does not yet support PHP 7.3.	2019-03-01 18:24:14 +08:00
Arif Waram	f18eb9728b	add an official redis stable config file (#1911 ) for more convenience start with default settings. ref. from http://download.redis.io/redis-stable/redis.conf	2019-03-01 15:48:23 +08:00