diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 00000000..61a5c983 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,6 @@ +# DO NOT CHANGE THIS FILE PLEASE. + +open_collective: laradock +ko_fi: laradock +issuehunt: laradock +custom: ['beerpay.io/laradock/laradock', 'paypal.me/mzmmzz'] diff --git a/.github/README.md b/.github/README.md index c3b5c842..6b79353d 100644 --- a/.github/README.md +++ b/.github/README.md @@ -16,7 +16,7 @@

Use Docker First - Then Learn About It Later

- forthebadge + forthebadge

@@ -24,13 +24,20 @@

- Laradock Docs + Laradock Documentation

- ## Sponsors +

+ + + Writing essays service Edubirdie + +

+ + @@ -42,7 +49,7 @@ For basic sponsorships go to [Open Collective](https://opencollective.com/laradock#sponsor), for golden sponsorships contact support@laradock.io. -*Your logo will show up on the [github repository](https://github.com/laradock/laradock/) index page and the [documentation](http://laradock.io/) main page, with a link to your website.* +*Your logo will show up on the [github repository](https://github.com/laradock/laradock/) index page and the [documentation](http://laradock.io/) main page.* ## People diff --git a/.github/home-page-images/sponsor-1.png b/.github/home-page-images/sponsor-1.png new file mode 100644 index 00000000..fc9bbd94 Binary files /dev/null and b/.github/home-page-images/sponsor-1.png differ diff --git a/DOCUMENTATION/config.toml b/DOCUMENTATION/config.toml index 8fd60626..1d11afbd 100644 --- a/DOCUMENTATION/config.toml +++ b/DOCUMENTATION/config.toml @@ -26,7 +26,7 @@ googleAnalytics = "UA-37514928-9" permalink = "#" # Custom assets - custom_css = [] + custom_css = ["custom-style.css"] custom_js = [] # Syntax highlighting theme diff --git a/DOCUMENTATION/content/documentation/index.md b/DOCUMENTATION/content/documentation/index.md index a9aeb8a1..d83b4422 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/DOCUMENTATION/content/introduction/index.md b/DOCUMENTATION/content/introduction/index.md index 48acd748..cc423149 100644 --- a/DOCUMENTATION/content/introduction/index.md +++ b/DOCUMENTATION/content/introduction/index.md @@ -20,6 +20,16 @@ Supports a variety of useful Docker Images, pre-configured to provide a wonderfu ## Sponsors +

+ + + Writing essays service Edubirdie + +

+ +
+ + @@ -31,7 +41,7 @@ Supports a variety of useful Docker Images, pre-configured to provide a wonderfu For basic sponsorships go to [Open Collective](https://opencollective.com/laradock#sponsor), for golden sponsorships contact support@laradock.io.
-*Your logo will show up on the [github repository](https://github.com/laradock/laradock/) index page and the [documentation](http://laradock.io/) main page, with a link to your website.* +*Your logo will show up on the [github repository](https://github.com/laradock/laradock/) index page and the [documentation](http://laradock.io/) main page.* ## Quick Overview diff --git a/DOCUMENTATION/static/custom-style.css b/DOCUMENTATION/static/custom-style.css new file mode 100644 index 00000000..0f3957fc --- /dev/null +++ b/DOCUMENTATION/static/custom-style.css @@ -0,0 +1,13 @@ +/* Custom CSS */ + +.article a { + border-bottom: none; +} +.project .logo { + width: 200px; + padding-right: 0; +} +.project .banner { + height: 70px; + padding: 25px; +} diff --git a/DOCUMENTATION/themes/hugo-material-docs/layouts/partials/drawer.html b/DOCUMENTATION/themes/hugo-material-docs/layouts/partials/drawer.html index 62e6fa2c..7fd69c9c 100644 --- a/DOCUMENTATION/themes/hugo-material-docs/layouts/partials/drawer.html +++ b/DOCUMENTATION/themes/hugo-material-docs/layouts/partials/drawer.html @@ -5,7 +5,7 @@ - Laradock + {{ end }} diff --git a/docker-compose.yml b/docker-compose.yml index 6712fd46..7afda61f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -191,6 +191,7 @@ services: - INSTALL_SSHPASS=${PHP_FPM_INSTALL_SSHPASS} - ADDITIONAL_LOCALES=${PHP_FPM_ADDITIONAL_LOCALES} - INSTALL_FFMPEG=${PHP_FPM_FFMPEG} + - INSTALL_XHPROF=${PHP_FPM_INSTALL_XHPROF} - http_proxy - https_proxy - no_proxy @@ -253,7 +254,7 @@ services: - INSTALL_PGSQL=${PHP_FPM_INSTALL_PGSQL} - INSTALL_BCMATH=${PHP_FPM_INSTALL_BCMATH} - INSTALL_MEMCACHED=${PHP_FPM_INSTALL_MEMCACHED} - - INSTALL_AMQP=${PHP_FPM_INSTALL_AMQP} + - INSTALL_SOCKETS=${LARAVEL_HORIZON_INSTALL_SOCKETS} - INSTALL_CASSANDRA=${PHP_FPM_INSTALL_CASSANDRA} volumes: - ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER} diff --git a/env-example b/env-example index d8749d17..a1a15481 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 ########################################### @@ -225,6 +225,10 @@ NGINX_PHP_UPSTREAM_CONTAINER=php-fpm NGINX_PHP_UPSTREAM_PORT=9000 NGINX_SSL_PATH=./nginx/ssl/ +### LARAVEL_HORIZON ################################################ + +LARAVEL_HORIZON_INSTALL_SOCKETS=false + ### APACHE ################################################ APACHE_HOST_HTTP_PORT=80 diff --git a/laravel-horizon/Dockerfile b/laravel-horizon/Dockerfile index c9486163..ee5b9ffd 100644 --- a/laravel-horizon/Dockerfile +++ b/laravel-horizon/Dockerfile @@ -24,7 +24,7 @@ RUN apk --update add wget \ procps RUN docker-php-ext-install mysqli mbstring pdo pdo_mysql tokenizer xml pcntl -RUN pecl channel-update pecl.php.net && pecl install memcached mcrypt-1.0.1 && docker-php-ext-enable memcached +RUN pecl channel-update pecl.php.net && pecl install memcached mcrypt-1.0.1 mongodb && docker-php-ext-enable memcached mongodb #Install BCMath package: ARG INSTALL_BCMATH=false @@ -33,8 +33,8 @@ RUN if [ ${INSTALL_BCMATH} = true ]; then \ ;fi #Install Sockets package: -ARG INSTALL_AMQP=false -RUN if [ ${INSTALL_AMQP} = true ]; then \ +ARG INSTALL_SOCKETS=false +RUN if [ ${INSTALL_SOCKETS} = true ]; then \ docker-php-ext-install sockets \ ;fi diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index 54207db7..5dd3ba72 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-${LARADOCK_PHP_VERSION} +FROM laradock/php-fpm:2.5-${LARADOCK_PHP_VERSION} LABEL maintainer="Mahmoud Zalt " @@ -263,7 +262,7 @@ ARG INSTALL_XHPROF=false RUN if [ ${INSTALL_XHPROF} = true ]; then \ # Install the php xhprof extension if [ $(php -r "echo PHP_MAJOR_VERSION;") = 7 ]; then \ - curl -L -o /tmp/xhprof.tar.gz "https://github.com/tideways/php-xhprof-extension/archive/v4.1.6.tar.gz"; \ + curl -L -o /tmp/xhprof.tar.gz "https://github.com/tideways/php-xhprof-extension/archive/v4.1.7.tar.gz"; \ else \ curl -L -o /tmp/xhprof.tar.gz "https://codeload.github.com/phacility/xhprof/tar.gz/master"; \ fi \ @@ -282,6 +281,10 @@ RUN if [ ${INSTALL_XHPROF} = true ]; then \ COPY ./xhprof.ini /usr/local/etc/php/conf.d +RUN if [ ${INSTALL_XHPROF} = false ]; then \ + rm /usr/local/etc/php/conf.d/xhprof.ini \ +;fi + ########################################################################### # AMQP: ########################################################################### diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile index fdd527cd..04dea432 100644 --- a/php-worker/Dockerfile +++ b/php-worker/Dockerfile @@ -24,7 +24,7 @@ RUN apk --update add wget \ supervisor RUN docker-php-ext-install mysqli mbstring pdo pdo_mysql tokenizer xml pcntl -RUN pecl channel-update pecl.php.net && pecl install memcached mcrypt-1.0.1 && docker-php-ext-enable memcached +RUN pecl channel-update pecl.php.net && pecl install memcached mcrypt-1.0.1 mongodb && docker-php-ext-enable memcached mongodb # Add a non-root user: ARG PUID=1000 diff --git a/workspace/Dockerfile b/workspace/Dockerfile index 06567f2c..f36f6694 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 " @@ -456,6 +455,7 @@ RUN if [ ${INSTALL_GEARMAN} = true ]; then \ ARG INSTALL_PHPREDIS=false RUN if [ ${INSTALL_PHPREDIS} = true ]; then \ + apt-get update -yqq && \ apt-get install -yqq php-redis \ ;fi