ykxiao
/
laradock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,669 Commits 1 Branch 159 Tags 14 MiB
Commit Graph

139 Commits

Author SHA1 Message Date
Shao Yu-Lung (Allen) 185ba60a09
Merge branch 'master' into master 2018-05-28 10:46:18 +08:00
Shao Yu-Lung (Allen) 7c88c33b29
Merge pull request #1504 from dougblackjr/master 
Adding pcntl to php-fpm, php-worker, addresses #1419
 2018-05-27 10:08:53 +08:00
Shao Yu-Lung (Allen) 20464d1bd2
Merge pull request #1510 from brunen9/remove-unused-variable-php-fpm-install-postgres 
Remove unused variable PHP_FPM_INSTALL_POSTGRES.
 2018-05-25 22:19:34 +08:00
Shao Yu-Lung (Allen) aee1adb0a1
Merge pull request #1533 from kaliberx/master 
Add subversion support in workspace
 2018-05-25 22:10:58 +08:00
Grzegorz Dąbrowski b990af3353 Add subversion support in workspace 2018-05-07 10:58:55 +02:00
SDLyu 9e5fdda294 Update env-example 2018-05-05 22:06:15 +08:00
Pavel Mironchik d142500216 Remove unused variable PHP_FPM_INSTALL_POSTGRES. 2018-04-27 21:48:16 +06:00
Douglas Black 6b6e2d5f86 Adding pcntl to php-fpm, php-worker, addresses #1419 2018-04-24 10:25:16 -04:00
Wouter van Dongen 3ad17eca0a - Fix Drush installation 
- Consistent naming of arguments
- Add deprecated install note
 2018-04-23 20:30:47 +02:00
Mahmoud Zalt 101986c76f merge the php versions dockerfiles in php-fpm, workspace and php-worker 2018-04-06 10:04:56 +03:00
Mahmoud Zalt a0c5ef75d2 upgrade docker-compose to v3 2018-04-05 16:43:22 +03:00
mfpang f810962d84 add APACHE_DOCUMENT_ROOT in env-example file 2018-03-18 17:38:49 +08:00
Suhaib Khan f90a81ef8b Update mysql version to latest 
Signed-off-by: Suhaib Khan <suheb.work@gmail.com>
 2018-03-13 11:52:20 +05:30
Yu-Lung Shao (Allen) 04105b912d
Merge pull request #1375 from wvdongen/master 
Added support for Apache Solr
 2018-02-27 17:19:20 +08:00
Yu-Lung Shao (Allen) 8d0bd8505c
Merge pull request #1354 from taufek/tj-install-prestissimo 
Install Prestissimo in Workspace
 2018-02-27 00:00:25 +08:00
Yu-Lung Shao (Allen) 43ba898df3
Merge branch 'master' into php-fpm-install-imap 2018-02-26 20:33:35 +08:00
Yu-Lung Shao (Allen) ca376935e1
Merge pull request #1382 from desaroger/php-72-pr 
Add PHP 7.2 support and fix issues on 5.6-7.0-7.1 versions
 2018-02-26 10:43:16 +08:00
Bolo Lai 4b5a1ef628 support custom composer repo url and npm registry url 2018-02-21 13:13:19 +08:00
desaroger 72d550e6e5 Set php default version to 72 2018-02-16 19:10:03 +01:00
desaroger 91131f0963 Add PHP 7.2 support 2018-02-16 18:40:13 +01:00
Sven Slijkoord 3b219d2974
Added env entry PHP_FPM_INSTALL_IMAP 2018-02-13 19:15:49 +01:00
Wouter van Dongen b7f89e6b00 Add Solr 2018-02-11 11:36:57 +01:00
Taufek Johar 0b902e3e96 Install Prestissimo in Workspace 
**Why we need this change?**

[Prestissimo](https://github.com/hirak/prestissimo) will enabled `composer` to install plugins in parallel.

**Source**

http://jackmcdade.com/blog/tired-of-waiting
 2018-01-17 10:21:08 +08:00
Mahmoud Zalt 0077de28a1
Merge pull request #1345 from jdxia/master 
workspace container adds swoole
 2018-01-09 19:23:10 +01:00
Mahmoud Zalt d098f1f6ad
Merge pull request #1322 from jk2K/master 
feat: add GMP extension to PHP-fpm
 2018-01-09 19:22:19 +01:00
x c44338e370 workspace container adds swoole 2018-01-09 11:25:57 +08:00
Fruty 0aaa2c742e Added support for AMQP extension in workspace and php-fpm containers. 2017-12-28 14:25:32 +02:00
yemeng1 0445d76d11 feat: add GMP extension to PHP-fpm 2017-12-27 18:56:26 +08:00
Mahmoud Zalt 694b39ddf4
Merge pull request #1293 from Rhymond/patch-1 
Compatibility for COMPOSE_FILE
 2017-12-04 08:51:32 +01:00
Raymond cf136f891b
Windows compatibility 
COMPOSE_PATH_SEPARATOR
If set, the value of the COMPOSE_FILE environment variable will be separated using this character as path separator.
 2017-12-03 23:04:20 +00:00
francoisfaubert 47c74d1334 Added clarification on how to split multiple docker-compose files within COMPOSE_FILE on Windows 2017-11-23 14:02:56 -05:00
Mahmoud Zalt e779bf96ab reorder some keys in the .env for easier modification 2017-11-23 20:52:42 +02:00
牟勇 8d410e9c82 merge upstream 2017-11-23 13:42:33 +08:00
Jeff 73b95357ac Specifying included docker-compose files in the .env is more flexible than hardcoding in the shell script. 2017-11-22 10:48:22 +13:00
Mahmoud Zalt 65a8bbc6a4
Merge pull request #1262 from jeff-h/issue-171 
Fixes #353 and allows easier dev & prod environments
 2017-11-21 22:56:04 +02:00
Jeff cf5b1af31a Fixes #353 and allows easier dev & prod environments by splitting dev-specific configuration into a separate docker-compose. 2017-11-21 09:59:11 +13:00
huadong zuo 9835a20863
Remove useless... 
Remove useless...
 2017-11-15 13:05:26 +08:00
牟勇 a99281cda8 Change application source from dl-cdn.alpinelinux.org to aliyun source 2017-11-14 21:03:19 +08:00
Mahmoud Zalt 2fc0f3cb2e improve readability of the .env file 2017-11-14 12:53:30 +02:00
Jérôme Desseaux c5ccc2f4ff soving python issue when using INSTALL_NODE=true and VueJS with Laravel. 2017-11-12 11:04:57 +01:00
Jeroen van Oort 23ee4f6679 added IMAP extension to workspace 2017-11-06 11:12:02 +01:00
Nick Hope 894b0197e0 Fixed: PHP-Worker has missing PGSQL drivers. 2017-10-29 12:54:05 +00:00
Thorvald Falkenburg a31114955a Remove variable 2017-10-25 12:12:20 +02:00
Thorvald Falkenburg f4ede08b9c Fix variable issues. 
Also made the variables introduced with the psql client consistent
with the existing ones. Fixes #1208
 2017-10-25 11:40:47 +02:00
Lan Dong Si Hoang (Geraint Dong) 60998ed1e4 Merge branch 'master' into Add_pg_client_to_workspace_phpfpm 2017-10-24 13:03:56 +07:00
Arkadius Jonczek b8e657b68f Merge remote-tracking branch 'upstream/master' 2017-10-19 14:31:02 +02:00
Arkadius Jonczek 49e48edefd Merge remote-tracking branch 'upstream/master' 2017-10-18 14:41:20 +02:00
Arkadius Jonczek 182386b514 removed grafana-storage 2017-10-18 14:38:10 +02:00
Arkadius Jonczek bea122a1fd removed depends_on from grafana and added Grafana port to env-example 2017-10-18 14:34:27 +02:00
Geraint Dong 7fb00658cf Add support for pgclient to workspace & php-fpm 
+ Update sample .env file
 2017-10-18 10:18:23 +07:00