e1036185ae
Fixing from #708 ( #715 )
...
* Fixing workspace_yarn_version
* Remove duplicate type MAINTAINER
* Update README.md
2017-03-26 10:47:03 +08:00
d1af24736b
Merge branch 'master' into proxy
2017-03-25 21:40:37 -04:00
236665d7d3
Change haproxy port to 8085
2017-03-26 08:13:14 +07:00
c340d851d3
Add mssql volumes
2017-03-26 07:30:59 +07:00
bf19ecffcb
Fixing conflict & add mssql
2017-03-26 07:20:24 +07:00
6fa6d02360
Merge pull request #712 from cabrerabywaters/MSSQL_DATABASE_SUPPORT
...
adding MsSQL DATABASE support
2017-03-25 16:55:34 -04:00
2e86243d88
Update docker-compose.yml
2017-03-24 13:49:38 -03:00
6b61c7d454
adding MSSQL support
2017-03-24 12:31:38 -03:00
894cb6ea27
🐛 fix yarn again after #662 reverted it
...
#706
2017-03-23 11:51:59 +01:00
b81e3e8f15
Fixing workspace_yarn_version
2017-03-23 16:32:11 +07:00
7d49f9b820
Fixing workspace_yarn_version
2017-03-23 16:07:59 +07:00
9dad1586af
Fixing identitation for docker-compose haproxy
2017-03-23 15:01:32 +07:00
5d74e10b08
Update docker compose file for load balancer
2017-03-23 13:53:52 +07:00
d31ccbd268
Conflict resolved docker-compose file
2017-03-18 08:29:14 +07:00
2bbe39cf4a
Merge branch 'master' into master
2017-03-18 07:52:45 +07:00
53f1032975
Merge pull request #673 from cabrerabywaters/PHP_WORKER
...
Php worker
2017-03-17 11:05:53 -04:00
badad156e1
Merge branch 'master' into add_apache_vhost_conf
2017-03-17 16:37:59 +08:00
2219177eac
Merge branch 'master' into master
2017-03-17 14:54:06 +07:00
8de9eca8ae
Fixing the docker-compose.yml
2017-03-17 13:57:54 +07:00
f2805bca52
Update docker-compose.yml
2017-03-16 22:21:26 -03:00
033e1b8721
Merge branch 'master' into PHP_WORKER
2017-03-16 21:59:28 -03:00
9e290ffddb
Merge pull request #680 from cjmaxik/feature-intl
...
Adding intl support to php-fpm container
2017-03-16 20:57:47 -04:00
6ada2f1b91
nginx samples sites for multiple projects
...
- add `project-1.conf` and `project-1.conf` to match the docs.
- keep default to work with both multiple and single projects.
- delete the .gitignore.
- update docker-compose and example-env file to match the new settings
- update the docs
- delete `laravel-https.conf` to replace it with documentation instead
2017-03-16 20:53:14 -04:00
4e443cec09
Merge branch 'master' into feature-intl
2017-03-17 10:08:21 +10:00
528b60eb17
fixing Volumes and Workdir
2017-03-16 21:03:04 -03:00
e0e4616ae0
update installation steps in the docs (.env)
2017-03-16 17:03:05 -04:00
c00fe5d7e0
Merge branch 'multiple-projects-improvement'
...
* multiple-projects-improvement:
updated env-example and removed .env.example
complete missings
Seperated mysqli and tokenizer as seperate options without putting them under code igniter
Apache should just go to /var/www not /var/www/public when supporting multiple projects
fixed example and docker-compose.yml
Fixed php-fpm variables and example
Split up mysqli and tokenizer
Removed homestead entirely this time
Removed homestead entirely this time
Removed Homestead reference in all DB containers
Removed reference to homestead
Fixed timezone issue in docker-compose.yml
Added NGINX from env file and updated env-example
Updated PHP-FPM container to accept .env variables
Added workspace from env file and updated env-example
Removed .env file
Added env-example and adjusted docker-compose yml to support new env file
Updated gitignore
2017-03-16 16:10:28 -04:00
dcec8a46a8
replace the links with depends_on in the docker-compose file
...
closes #636
2017-03-16 15:11:04 -04:00
1d6583e97e
Revert "Add apache conf file for specific virtualhost ServerName"
2017-03-16 14:40:45 -04:00
1cf5bcde62
Merge pull request #682 from MauricioTRS/master
...
Elasticsearch - Fix plugins directory
2017-03-16 13:35:24 -04:00
db40c67f75
Merge pull request #639 from tiknil/master
...
Add apache conf file for specific virtualhost ServerName
2017-03-16 13:30:14 -04:00
a42a295951
Merge pull request #485 from AliveCorpse/feature/workspace_with_php_7.1
...
Add dokerfile with php 7.1
2017-03-16 13:26:36 -04:00
73a3745cc3
Merge pull request #370 from philtrep/certbot
...
Certbot container
2017-03-16 13:25:15 -04:00
bed0fd9bdb
Elasticsearch - Fix plugins directory
2017-03-16 14:24:56 -03:00
3f1d4b70a6
Merge pull request #650 from wayanjimmy/feature/mailhog
...
Add mailhog for mail debugging
2017-03-16 13:23:28 -04:00
c62ce7d36f
Update docker-compose.yml
2017-03-16 09:59:52 +10:00
cbd3cf7c20
Adding php-worker container to docker-compose
2017-03-14 11:06:45 -03:00
fd0cbff16c
Adding ARG to docker-compose
2017-03-14 10:58:35 -03:00
ab1d5bae95
complete missings
2017-03-13 21:03:31 -04:00
c88e690bb4
Merge branch 'master' into master
2017-03-10 08:09:07 +07:00
c1de398acc
Change default phpmyadmin environment for mysql
2017-03-10 07:53:33 +07:00
73f7c88122
Fixing environment in docker-compose file
2017-03-09 19:21:36 +07:00
36fcc6674e
Seperated mysqli and tokenizer as seperate options without putting them under code igniter
2017-03-09 09:29:07 +01:00
37ed904f1a
add vhost example
2017-03-09 10:26:47 +08:00
7a343f168f
Updated with laradock master
2017-03-08 16:08:42 +01:00
178d7e1505
fix selenium ( #655 )
...
see https://github.com/SeleniumHQ/docker-selenium#running-the-images
2017-03-07 23:57:18 -05:00
1d918a71d8
fixed example and docker-compose.yml
2017-03-06 22:20:31 +01:00
603010cbd5
Split up mysqli and tokenizer
2017-03-06 09:03:12 +01:00
a7503ce3f3
Add Minio container
...
Minio is an s3 compatible server written in go.
2017-03-05 15:06:22 +01:00
48710f19c3
Sync with master
2017-03-04 02:10:34 +08:00
0983cc98fe
Setup mailhog
2017-03-04 02:07:29 +08:00
6be81f05c2
- Aggiunto servizio php-worker per avviamento queue
2017-03-02 12:14:38 +01:00
8317fbde5c
- Eliminato .env dal repo git per poterlo linkare nel progetto locale
...
- Impostata configurazione dinamica porte per apache
2017-03-01 15:55:33 +01:00
b45f395996
Removed homestead entirely this time
2017-03-01 08:29:17 +01:00
59dfacee13
Removed homestead entirely this time
2017-03-01 08:17:34 +01:00
a6e0338245
Removed Homestead reference in all DB containers
2017-03-01 08:08:20 +01:00
f610aa63d1
Removed reference to homestead
2017-02-27 15:58:38 +01:00
966a84fa39
Fixed timezone issue in docker-compose.yml
2017-02-27 14:49:43 +01:00
356dc36fd5
Added NGINX from env file and updated env-example
2017-02-27 14:11:16 +01:00
c112fdffc1
Updated PHP-FPM container to accept .env variables
2017-02-27 14:05:47 +01:00
fa9ac1e471
Added workspace from env file and updated env-example
2017-02-27 13:53:40 +01:00
474504f1d3
Added env-example and adjusted docker-compose yml to support new env file
2017-02-27 12:35:28 +01:00
770a9779ca
Fix Caddy volumes to persist SSL ( #613 )
...
I'm blaming commit 380eef5fd9
2017-02-21 23:26:56 +08:00
cf34c4ed32
Fixed SOAP for both php-fpm and CLI
2017-02-07 15:21:30 -07:00
c5e2e7e1e2
Add deployer support ( #579 )
...
* add deployer option
* export path for all composer global installations
* add deployer option
* fix typo
* add readme for deployer installation
* deployer default option changed to false
* Add missing deployer menu
2017-01-31 17:05:42 +08:00
5d2761bc92
Add missing PhpRedis option ( #570 )
2017-01-26 22:19:13 +08:00
a94f08920a
add php exif ( #564 )
...
* add php exif
* format
2017-01-22 12:20:27 +08:00
a80ef301a9
541-add-linuxbrew-option ( #543 )
...
* 541-add-linuxbrew-option
* 541 updated readme with installation information
2017-01-13 14:12:44 -05:00
14f6dffe99
Fix bug on mariadb
...
Bug on Docker for Mac when we change the database from mysql to mariadb.
Maybe It is not a perfect fix. This fix will not share the same mysql volume, means we could not change database directly. We have to import the database to both database. But it will fix the Bug . Wish for better solution
2017-01-12 18:47:11 +08:00
2fc3919598
Added service container for Selenium standalone with Chrome ( #519 )
...
* Added service container for Selenium standalone with Chrome
2017-01-01 10:22:01 -05:00
1ce802f2cc
Update docker-compose.yml
2016-12-26 12:38:50 -02:00
33e8e91e49
Add Laravel Envoy ( #510 )
...
Add laravel envoy
2016-12-25 12:38:25 -05:00
b10108a9b5
disable installing the bcmath by default
...
disable installing the PHP bcmath extension by default on the php-fpm container
2016-12-21 14:20:40 -05:00
860af556e2
Support bcmath php extention on php-fpm and workspace (base image 1.3)
...
Probably closes #453
2016-12-21 14:01:51 -05:00
d76f9e7722
Typo
...
elasticsearch-pkugins -> elasticsearch-plugins
2016-12-21 10:16:32 -03:00
e9d3a838f1
Merge pull request #491 from laradock/bug
...
fix #490 duplication of key "volumes"
2016-12-16 17:23:01 +08:00
380eef5fd9
fix #490 duplication of key "volumes"
...
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-12-16 17:21:45 +08:00
b8142222e5
Support specific version of yarn.
...
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-12-16 09:36:08 +08:00
da6b950623
Added SOAP option to php-fpm install.
2016-12-15 12:13:27 -07:00
aabe504c24
Add dokerfile with php 7.1
2016-12-15 15:13:00 +02:00
8bacb129c6
Add option to install Google V8 Javascript Engine PHP extension
2016-12-13 20:00:48 -05:00
a3288462a8
Merge pull request #434 from dlnsk/Fixes
...
Fixes for nginx and mysql
2016-11-25 01:51:25 -05:00
4ef5db3713
Added proper creation of mysql user, removal of default homestead user
2016-11-17 16:37:51 -05:00
d703c82c46
Exclude sites configuration from image and just use volume
2016-11-16 15:58:42 +07:00
d89a944e22
Added nginx config for certbot
2016-11-14 11:29:44 -05:00
4030cc2f26
Added certbot container
2016-11-14 11:27:37 -05:00
7e2814168a
fixed #420 remove phpmyadmin volume setting.
2016-11-14 23:45:52 +08:00
5d98e78dba
Revert #418 and fix install yarn package management.
...
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-11-10 10:23:49 +08:00
c5d1116333
Merge pull request #418 from moxar/yarn
...
Fix a bug that prevents yarn from installing #415
2016-11-09 15:17:42 -05:00
5594c53e03
Fix bug in PATH
2016-11-09 17:55:35 +01:00
44045f85e6
Fix a bug that prevents yarn from installing
2016-11-09 16:14:49 +01:00
a42f62c626
Postgis
2016-11-08 13:17:23 +00:00
3d54d68aa1
Fix for mariadb local path
...
When running docker-compose with mariadb the following message will appear:
ERROR: for mariadb Cannot create container for service mariadb: Invalid volume spec "mariadb": Invalid volume destination path: 'mariadb' mount path must be absolute.
ERROR: Encountered errors while bringing up the project.
This commit fixes the issue.
2016-11-03 15:45:59 +02:00
146f8ea6f4
rename volumes_source to applications
2016-11-01 10:05:10 -04:00
9ab6d8fa15
remove volumes container
2016-11-01 10:03:47 -04:00
f630970151
remove `./databases:/docker-entrypoint-initdb.d` until it works
2016-10-31 20:46:02 -04:00
739cc31f4c
change app mapping directory from www/laravel to www
...
also add sample to show facilitate setup for multiple sites
2016-10-31 19:49:48 -04:00
6ee790c26d
Add support for Codeigniter
2016-10-31 12:21:01 -04:00
a1ade52cd6
Merge pull request #369 from LaraDock/patch
...
fixed #363 PHP_IDE_CONFIG variable.
2016-10-31 08:08:48 -04:00
a0981aa836
Add install elasticsearch plugin section.
...
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-10-26 09:40:53 +08:00
6eed8199df
update port to 2222 - no conflict linux
2016-10-24 03:58:03 -04:00
891911ddc3
Removing double quotes for apache php fpm configuration.
2016-10-17 14:17:23 -07:00
89a21ccf1b
fixed #363 PHP_IDE_CONFIG variable.
...
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-10-15 08:50:17 +08:00
62e0f0443c
Support Yarn MANAGEMENT tool.
...
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-10-13 12:06:30 +08:00
fb26035e5c
Added timezone arguments to workspace build
2016-10-10 09:44:25 -04:00
781f5ff972
add missing info to the readme
2016-10-10 07:32:01 -04:00
7ecb712e76
Revert ports fowarding for MySQL and MariaDB
...
Include production docker compose file
2016-10-09 16:51:18 -04:00
ec3ebb9701
Remove port fowarding for MySQL and MariaDB
2016-10-03 13:25:34 -04:00
16b6223ba9
Fixes #305
2016-09-13 21:40:03 -04:00
b254d4a9c9
add mysql custom configuration file.
...
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-09-11 08:39:25 +08:00
da6face95e
add build options MAX_ALLOWED_PACKET to mysql
2016-09-09 10:21:33 +08:00
8c392e94f2
Support ElasticSearch Container.
...
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-09-07 15:18:54 +08:00
a9ecdd0008
Merge pull request #284 from appleboy/patch-1
...
Update postgres share volume path
2016-09-04 05:26:40 -04:00
1dab0c48d8
Merge pull request #283 from appleboy/patch-10
...
Add pgAdmin container
2016-09-04 05:26:10 -04:00
4013553dbb
Update postgres share volume path
2016-09-04 09:04:18 +08:00
7999399e9a
Add pgAdmin container.
...
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-09-03 21:24:36 +08:00
d684cb4742
remove port 22 from php-fpm because of conflict
2016-09-02 10:38:15 -06:00
a3039958e3
Fix conflicts
2016-09-01 13:23:40 +01:00
b01bae59fc
Fix volumes aerospike section
2016-09-01 13:21:21 +01:00
92dc3be3b1
Remove duplicate argument on aerospike section
2016-09-01 13:05:53 +01:00
07d6ec85ca
Merge branch 'master' of github.com:LarryEitel/laradock
2016-08-30 08:40:28 -06:00
adfb559521
Merge pull request #269 from LarryEitel/expose-port-22-and-add-insecure_id_rsa_ppk
...
expose-port-22-and-add-insecure_id_rsa_ppk
2016-08-30 17:29:51 +03:00
05e0e9c817
Merge pull request #264 from LarryEitel/expose-port-22-in-workspace-add-insecure_id_rsa_ppk
...
expose-port-22-in-workspace-add-insecure_id_rsa_ppk
2016-08-30 11:06:16 +03:00
6dcb174012
Merge pull request #266 from bktz/master
...
Added support for RabbitMQ
2016-08-30 11:03:57 +03:00
de914d106f
Merge pull request #262 from computerfr33k/260-reduce-data-only-volume-size
...
use docker image which only supplies true & echo binaries.
2016-08-30 11:01:33 +03:00
1e5d604470
Added support for RabbitMQ
2016-08-28 18:12:55 +10:00
d441427852
Expose port 22 for workspace ssh. Add private key for PHPStorm Windows users.
2016-08-27 17:22:36 -06:00
227c8da17c
Expose port 22 for workspace ssh. Add private key for PHPStorm Windows users.
2016-08-27 17:00:01 -06:00
6ba76da709
use docker image which only supplies true & echo binaries.
2016-08-27 13:18:13 -05:00
78be0b577e
support specific node version
...
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-08-27 19:38:44 +08:00
29d714a849
caddy log to file. enable gzip compression.
2016-08-26 13:26:22 -05:00
9fb50b2c6b
fix phpmyadmin port. closes #247
2016-08-24 00:43:11 +03:00
3c8861d1d2
remove empty data folder for mariadb.
...
ref:
d969a465ee/10.1/Dockerfile (L83)
2016-08-22 11:02:21 +08:00
2d51548879
support phpmyadmin container.
...
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-08-22 11:01:34 +08:00
4aa3902f32
Merge pull request #242 from LarryEitel/install-and-startup-workspace-ssh
...
Install and start workspace ssh
2016-08-22 03:30:17 +03:00
1afad7f14c
Add configuration to install aerospike php extension
2016-08-20 19:05:38 +01:00
9bd70aadc8
Added aerospike cache service
2016-08-20 12:28:45 +01:00
e75da747a9
general clean up
2016-08-19 03:05:36 +03:00
4e7e003e87
ssh keys
2016-08-17 19:24:00 -06:00
cfc81fca64
Allow for config of crush and opcache in the main docker file
2016-08-16 17:51:41 -04:00
380c7bd1ec
Merge branch 'multi-sites-branch' of https://github.com/LarryEitel/laradock into multi-sites
...
* 'multi-sites-branch' of https://github.com/LarryEitel/laradock :
Proof of concept - LaraDock hosting multiple sites
2016-08-16 15:56:19 +03:00
b4760ac703
Merge branch 'xdebugPhpFpm' of https://github.com/LarryEitel/laradock into LarryEitel-xdebugPhpFpm
...
* 'xdebugPhpFpm' of https://github.com/LarryEitel/laradock :
Provided a way to Stop/Start php-fpm xdebug via bash script.
2016-08-16 15:13:42 +03:00
a6e04aa659
Added PHP Memcached extension installation for PHP 5.6
2016-08-16 16:31:52 +07:00
93504a714d
Proof of concept - LaraDock hosting multiple sites
2016-08-15 15:14:05 -06:00
d8a4537efb
Provided a way to Stop/Start php-fpm xdebug via bash script.
2016-08-15 09:28:32 -06:00
1fdf800988
add options INSTALL_ZIP_ARCHIVE to php-fpm
2016-08-14 15:53:08 +08:00
b7d38ef7dd
parameter data in the path
2016-07-28 11:49:42 +02:00
5e0e120950
add apache2 container.
2016-07-27 19:35:58 -05:00
20adc9ca13
accidentally forgot to set INSTALL_NODE back to false.
2016-07-27 02:56:48 -05:00
17e252a436
add non-root user for workspace container.
2016-07-27 02:43:38 -05:00
ZeroC0D3 Team