blackbirdchess/blackbirdchess-docker-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into gearman

Browse Source
This commit is contained in:
stefan 2019-09-02 13:18:28 +02:00 committed by GitHub
commit e608528da5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 62 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/FUNDING.yml vendored Normal file
View File

@ -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']

13
.github/README.md vendored
View File

@ -24,13 +24,20 @@
<p align="center">
<a href="http://laradock.io">
<img src="https://raw.githubusercontent.com/laradock/laradock/master/.github/home-page-images/documentation-button.png" width=300px" alt="Laradock Docs"/>
<img src="https://raw.githubusercontent.com/laradock/laradock/master/.github/home-page-images/documentation-button.png" width="300px" alt="Laradock Documentation"/>
</a>
</p>
## Sponsors
<p align="center">
<!-- Golden Sponsors -->
<a href="https://edubirdie.com/?ref=Laradock" target="_blank">
<img src="https://raw.githubusercontent.com/laradock/laradock/master/.github/home-page-images/sponsor-1.png?raw=true" width="300px" alt="Writing essays service Edubirdie"/>
</a>
</p>
<!-- OpenCollective Sponsors -->
<a href="https://opencollective.com/laradock/sponsor/0/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/0/avatar.svg"></a>
<a href="https://opencollective.com/laradock/sponsor/1/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/1/avatar.svg"></a>
<a href="https://opencollective.com/laradock/sponsor/2/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/2/avatar.svg"></a>
@ -42,7 +49,7 @@
For basic sponsorships go to [Open Collective](https://opencollective.com/laradock#sponsor), for golden sponsorships contact <a href = "mailto: support@laradock.io">support@laradock.io</a>.
*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

BIN
.github/home-page-images/sponsor-1.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 70 KiB

2
DOCUMENTATION/config.toml
View File

@ -26,7 +26,7 @@ googleAnalytics = "UA-37514928-9"
permalink = "#"
# Custom assets
custom_css = []
custom_css = ["custom-style.css"]
custom_js = []
# Syntax highlighting theme

1
DOCUMENTATION/content/documentation/index.md
View File

@ -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.

12
DOCUMENTATION/content/introduction/index.md
View File

@ -20,6 +20,16 @@ Supports a variety of useful Docker Images, pre-configured to provide a wonderfu
<a name="sponsors"></a>
## Sponsors
<p align="center">
<!-- Golden Sponsors -->
<a href="https://edubirdie.com/?ref=Laradock" target="_blank">
<img src="https://raw.githubusercontent.com/laradock/laradock/master/.github/home-page-images/sponsor-1.png?raw=true" width="300px" alt="Writing essays service Edubirdie"/>
</a>
</p>
<br>
<!-- OpenCollective Sponsors -->
<a href="https://opencollective.com/laradock/sponsor/0/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/0/avatar.svg"></a>
<a href="https://opencollective.com/laradock/sponsor/1/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/1/avatar.svg"></a>
<a href="https://opencollective.com/laradock/sponsor/2/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/2/avatar.svg"></a>
@ -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 <a href = "mailto: support@laradock.io">support@laradock.io</a>.
<br>
*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

13
DOCUMENTATION/static/custom-style.css Normal file
View File

@ -0,0 +1,13 @@
/* Custom CSS */
.article a {
border-bottom: none;
}
.project .logo {
width: 200px;
padding-right: 0;
}
.project .banner {
height: 70px;
padding: 25px;
}

2
DOCUMENTATION/themes/hugo-material-docs/layouts/partials/drawer.html
View File

@ -5,7 +5,7 @@
<div class="logo">
<img src="{{ $.Site.BaseURL }}{{ . }}">
</div>
Laradock
{{ end }}
<!--<div class="name">-->
<!--<strong>{{ .Site.Title }} {{ with .Site.Params.version }}<span class="version">{{ . }}</span>{{ end }}</strong>-->

3
docker-compose.yml
View File

@ -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}

6
env-example
View File

@ -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

6
laravel-horizon/Dockerfile
View File

@ -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

9
php-fpm/Dockerfile
View File

@ -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 <mahmoud@zalt.me>"
@ -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:
###########################################################################

2
php-worker/Dockerfile
View File

@ -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

4
workspace/Dockerfile
View File

@ -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>"
@ -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