Merge pull request #1293 from Rhymond/patch-1

Compatibility for COMPOSE_FILE
Merge pull request #1279 from scaule/scaule-patch
2017-12-04 08:51:32 +01:00 · 2017-12-04 08:38:29 +01:00 · 2017-12-04 08:36:37 +01:00 · 2017-12-04 08:36:03 +01:00 · 2017-12-04 08:35:01 +01:00 · 2017-12-04 08:34:17 +01:00
7 changed files with 76 additions and 13 deletions
--- a/.github/README.md
+++ b/.github/README.md
@ -6,7 +6,7 @@

 <p align="center">
   <a href="https://travis-ci.org/laradock/laradock"><img src="https://travis-ci.org/laradock/laradock.svg?branch=master" alt="Build status"></a>
-   <a href="https://github.com/laradock/laradock/stargazers"><img src="https://img.shields.io/github/stars/laradock/laradock.svg" alt="GitHub stars"></a>
+   <a href="https://github.com/laradock/laradock/stargazers"><a href="#backers" alt="sponsors on Open Collective"><img src="https://opencollective.com/laradock/backers/badge.svg" /></a> <a href="#sponsors" alt="Sponsors on Open Collective"><img src="https://opencollective.com/laradock/sponsors/badge.svg" /></a> <img src="https://img.shields.io/github/stars/laradock/laradock.svg" alt="GitHub stars"></a>
   <a href="https://github.com/laradock/laradock/network"><img src="https://img.shields.io/github/forks/laradock/laradock.svg" alt="GitHub forks"></a>
   <a href="https://github.com/laradock/laradock/issues"><img src="https://img.shields.io/github/issues/laradock/laradock.svg" alt="GitHub issues"></a>
   <a href="https://raw.githubusercontent.com/laradock/laradock/master/LICENSE"><img src="https://img.shields.io/badge/license-MIT-blue.svg" alt="GitHub license"></a>
@ -31,10 +31,27 @@

 ## Sponsors

+Support this project by becoming a sponsor. 
+
+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. [[Become a sponsor](https://opencollective.com/laradock#sponsor)]
+
 <a target='_blank' rel='nofollow' href='https://app.codesponsor.io/link/JHiroABWV9N5QKgcFuTA2NxX/laradock/laradock'>
  <img alt='Sponsor' width='888' height='68' src='https://app.codesponsor.io/embed/JHiroABWV9N5QKgcFuTA2NxX/laradock/laradock.svg' />
 </a>

+
+<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>
+<a href="https://opencollective.com/laradock/sponsor/3/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/3/avatar.svg"></a>
+<a href="https://opencollective.com/laradock/sponsor/4/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/4/avatar.svg"></a>
+<a href="https://opencollective.com/laradock/sponsor/5/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/5/avatar.svg"></a>
+<a href="https://opencollective.com/laradock/sponsor/6/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/6/avatar.svg"></a>
+<a href="https://opencollective.com/laradock/sponsor/7/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/7/avatar.svg"></a>
+<a href="https://opencollective.com/laradock/sponsor/8/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/8/avatar.svg"></a>
+<a href="https://opencollective.com/laradock/sponsor/9/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/9/avatar.svg"></a>
+
+
 ## Contributors

 #### Core contributors:
@ -53,7 +70,8 @@
 - Join us, by submitting 20 useful PR's.

 #### Awesome contributors:
- See full list [here](https://github.com/apiato/apiato/graphs/contributors).
+
+<a href="graphs/contributors"><img src="https://opencollective.com/laradock/contributors.svg?width=890" /></a>


 ## Donations
@ -65,6 +83,10 @@ Donate directly via [Paypal](https://www.paypal.me/mzalt)

 [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.me/mzalt) 

+or become a backer on [Open Collective](https://opencollective.com/laradock#backer)
+
+<a href="https://opencollective.com/laradock#backers" target="_blank"><img src="https://opencollective.com/laradock/backers.svg?width=890"></a>
+
 or show your support via [Beerpay](https://beerpay.io/laradock/laradock) 

 [![Beerpay](https://beerpay.io/laradock/laradock/badge.svg?style=flat)](https://beerpay.io/laradock/laradock)
--- a/DOCUMENTATION/content/getting-started/index.md
+++ b/DOCUMENTATION/content/getting-started/index.md
@ -162,6 +162,7 @@ cp env-example .env

 You can edit the `.env` file to chose which software's you want to be installed in your environment. You can always refer to the `docker-compose.yml` file to see how those variables are been used.

+Depending on the host's operating system you may need to change the value given to `COMPOSE_FILE`. When you are running Laradock on Mac OS the correct file separator to use is `:`. When running Laradock from a Windows environment multiple files must be separated with `;`.

 2 - Build the enviroment and run it using `docker-compose`

--- a/DOCUMENTATION/content/introduction/index.md
+++ b/DOCUMENTATION/content/introduction/index.md
@ -118,12 +118,32 @@ If you can't find your Software in the list, build it yourself and submit it. Co

 ## Sponsors

+
+
+
+
+Support this project by becoming a sponsor. 
+
+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. [[Become a sponsor](https://opencollective.com/laradock#sponsor)]
+
+<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>
+<a href="https://opencollective.com/laradock/sponsor/3/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/3/avatar.svg"></a>
+<a href="https://opencollective.com/laradock/sponsor/4/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/4/avatar.svg"></a>
+<a href="https://opencollective.com/laradock/sponsor/5/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/5/avatar.svg"></a>
+<a href="https://opencollective.com/laradock/sponsor/6/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/6/avatar.svg"></a>
+<a href="https://opencollective.com/laradock/sponsor/7/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/7/avatar.svg"></a>
+<a href="https://opencollective.com/laradock/sponsor/8/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/8/avatar.svg"></a>
+<a href="https://opencollective.com/laradock/sponsor/9/website" target="_blank"><img src="https://opencollective.com/laradock/sponsor/9/avatar.svg"></a>
+
 <a target='_blank' rel='nofollow' href='https://app.codesponsor.io/link/JHiroABWV9N5QKgcFuTA2NxX/laradock/laradock'>
  <img alt='Sponsor' width='888' height='68' src='https://app.codesponsor.io/embed/JHiroABWV9N5QKgcFuTA2NxX/laradock/laradock.svg' />
 </a>



+
 <a name="what-is-docker"></a>
 ## What is Docker?

@ -190,6 +210,10 @@ Donate directly via [Paypal](https://www.paypal.me/mzalt)

 [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.me/mzalt) 

+or become a backer on [Open Collective](https://opencollective.com/laradock#backer)
+
+<a href="https://opencollective.com/laradock#backers" target="_blank"><img src="https://opencollective.com/laradock/backers.svg?width=890"></a>
+
 or show your support via [Beerpay](https://beerpay.io/laradock/laradock) 

 [![Beerpay](https://beerpay.io/laradock/laradock/badge.svg?style=flat)](https://beerpay.io/laradock/laradock)
--- a/docker-sync.yml
+++ b/docker-sync.yml
@ -1,7 +1,7 @@
 version: "2"

 options:
-  verbose: true
+  verbose: false
 syncs:
  applications-docker-sync: # name of the intermediary sync volume
    compose-dev-file-path: 'docker-compose.sync.yml' # docker-compose override file
--- a/18
+++ b/18
@ -2,11 +2,6 @@
 # General Setup
 ###########################################################

-### Docker compose files ###############################################################################################
-# Select which docker-compose files to include.
-
-COMPOSE_FILE=docker-compose.yml:docker-compose.dev.yml
-
 ### Application Path ###################################################################################################
 # Point to your code, will be available at `/var/www`.

@ -27,6 +22,14 @@ PHP_INTERPRETER=php-fpm

 DATA_SAVE_PATH=~/.laradock/data

+### Docker compose files ###############################################################################################
+# Select which docker-compose files to include.
+# If using docker-sync. Set the value to: docker-compose.yml:docker-compose.dev.yml:docker-compose.sync.yml
+# Change the separator from : to ; on Windows
+
+COMPOSE_PATH_SEPARATOR=:
+COMPOSE_FILE=docker-compose.yml:docker-compose.dev.yml
+
 ### Docker Host IP #####################################################################################################
 # Enter your Docker Host IP (will be appended to /etc/hosts). Default is `10.0.75.1`

@ -42,6 +45,11 @@ PHP_IDE_CONFIG=serverName=laradock

 COMPOSE_CONVERT_WINDOWS_PATHS=1

+### Environment ########################################################################################################
+# If you're in China, or you need to change sources, will be set CHANGE_SOURCE to true in .env.
+
+CHANGE_SOURCE=false
+
 ########################################################################################################################

 ###########################################################
--- a/nginx/Dockerfile
+++ b/nginx/Dockerfile
@ -4,14 +4,22 @@ MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>

 ADD nginx.conf /etc/nginx/

-ARG PHP_UPSTREAM_CONTAINER=php-fpm
-ARG PHP_UPSTREAM_PORT=9000
+# If you're in China, or you need to change sources, will be set CHANGE_SOURCE to true in .env.
+
+ARG CHANGE_SOURCE=false
+RUN if [ ${CHANGE_SOURCE} = true ]; then \
+    # Change application source from dl-cdn.alpinelinux.org to aliyun source
+    RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/' /etc/apk/repositories \
+;fi

 RUN apk update \
    && apk upgrade \
    && apk add --no-cache bash \
    && adduser -D -H -u 1000 -s /bin/bash www-data

+ARG PHP_UPSTREAM_CONTAINER=php-fpm
+ARG PHP_UPSTREAM_PORT=9000
+
 # Set upstream conf and remove the default conf
 RUN echo "upstream php-upstream { server ${PHP_UPSTREAM_CONTAINER}:${PHP_UPSTREAM_PORT}; }" > /etc/nginx/conf.d/upstream.conf \
    && rm /etc/nginx/conf.d/default.conf
--- a/sync.sh
+++ b/sync.sh
@ -59,11 +59,11 @@ if [ "$1" == "up" ] ; then

    print_style "Initializing Docker Compose\n" "info"
    shift # removing first argument
-    docker-compose -f docker-compose.yml -f docker-compose.sync.yml up -d ${@}
+    docker-compose up -d ${@}

 elif [ "$1" == "down" ]; then
    print_style "Stopping Docker Compose\n" "info"
-    docker-compose down
+    docker-compose stop

    print_style "Stopping Docker Sync\n" "info"
    docker-sync stop
@ -86,4 +86,4 @@ else
    print_style "Invalid arguments.\n" "danger"
    display_options
    exit 1
-fi
+fi
Author	SHA1	Message	Date
Mahmoud Zalt	694b39ddf4	Merge pull request #1293 from Rhymond/patch-1 Compatibility for COMPOSE_FILE	2017-12-04 08:51:32 +01:00
Mahmoud Zalt	d0167475ba	Merge pull request #1279 from scaule/scaule-patch Don't use docker-compose down to stop containers	2017-12-04 08:38:29 +01:00
Mahmoud Zalt	3bdab382ea	Merge pull request #1276 from scaule/patch-#1275 #1275 Fix memory leaks in docker-sync with verbose true	2017-12-04 08:36:37 +01:00
Mahmoud Zalt	80f6e8b60c	Merge pull request #1273 from EnnioSimoes/master adding '\' to the Dockerfile nginx statement	2017-12-04 08:36:03 +01:00
Mahmoud Zalt	ba61566f28	Merge pull request #1269 from francoisfaubert/master Clarified how to split multiple docker-compose files on Windows	2017-12-04 08:35:01 +01:00
Mahmoud Zalt	9ae10d32ce	Merge pull request #1233 from zuohuadong/patch-18 Remove duplicate configuration	2017-12-04 08:34:17 +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
Caule Simon	59dff53176	Don't use docker-compose down to stop containers This delete containers and volume too. Use docker-compose stop who only stop containers	2017-11-28 15:33:27 +01:00
Caule Simon	34267ffc4d	#1275 Fix memory leaks in docker-sync with verbose true	2017-11-27 12:00:05 +01:00
Ennio Simões	57918b69a7	adding '\' to the Dockerfile nginx statement	2017-11-26 17:30:32 -02:00
francoisfaubert	c11658559a	Updated the documentation to illustrate my proposition	2017-11-23 14:21:38 -05: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
Mahmoud Zalt	06ce5ca222	add open collective to the documentation	2017-11-23 20:41:41 +02:00
Mahmoud Zalt	c06c28aa04	Merge branch 'opencollective-opencollective' * opencollective-opencollective: add open collective to the readme Update README.md	2017-11-23 20:30:27 +02:00
Mahmoud Zalt	c1e80e3af4	add open collective to the readme	2017-11-23 20:30:10 +02:00
Mahmoud Zalt	a7c9232193	Merge branch 'opencollective' of https://github.com/opencollective/laradock into opencollective-opencollective * 'opencollective' of https://github.com/opencollective/laradock: Update README.md	2017-11-23 20:16:54 +02:00
Mahmoud Zalt	265bc13917	Merge pull request #1251 from mouyong/master Set environment to change source.	2017-11-23 20:12:11 +02:00
牟勇	8d410e9c82	merge upstream	2017-11-23 13:42:33 +08:00
Aseem Sood	f56a585ab2	Update README.md	2017-11-22 17:52:45 -05:00
Mahmoud Zalt	9b8d4806a8	Merge pull request #1265 from jeff-h/master1 Specifying included docker-compose files in the .env is more flexible	2017-11-22 20:15:07 +02: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
牟勇	a99281cda8	Change application source from dl-cdn.alpinelinux.org to aliyun source	2017-11-14 21:03:19 +08:00
牟勇	1342b696ea	Merge branch 'master' of https://github.com/laradock/laradock	2017-11-14 20:57:52 +08:00
zuohuadong	fd5bb38a8c	Update env-example Remove duplicate configuration	2017-11-07 10:54:19 +08:00
蜗牛	025a339062	change application source #397 # fix a problem--#397, change application source from dl-cdn.alpinelinux.org to aliyun source.	2017-02-15 10:20:18 +08:00