Skip to content

Commit d3fb967

Browse files
authored
Merge pull request laradock#21 from laradock/master
Up-to-date
2 parents bf69133 + fdcf911 commit d3fb967

57 files changed

Lines changed: 1312 additions & 236 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/CODE_OF_CONDUCT.md

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
## Our Pledge
4+
5+
In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
6+
7+
## Our Standards
8+
9+
Examples of behavior that contributes to creating a positive environment include:
10+
11+
* Using welcoming and inclusive language
12+
* Being respectful of differing viewpoints and experiences
13+
* Gracefully accepting constructive criticism
14+
* Focusing on what is best for the community
15+
* Showing empathy towards other community members
16+
17+
Examples of unacceptable behavior by participants include:
18+
19+
* The use of sexualized language or imagery and unwelcome sexual attention or advances
20+
* Trolling, insulting/derogatory comments, and personal or political attacks
21+
* Public or private harassment
22+
* Publishing others' private information, such as a physical or electronic address, without explicit permission
23+
* Other conduct which could reasonably be considered inappropriate in a professional setting
24+
25+
## Our Responsibilities
26+
27+
Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
28+
29+
Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
30+
31+
## Scope
32+
33+
This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
34+
35+
## Enforcement
36+
37+
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at mahmoud@zalt.me. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
38+
39+
Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
40+
41+
## Attribution
42+
43+
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
44+
45+
[homepage]: http://contributor-covenant.org
46+
[version]: http://contributor-covenant.org/version/1/4/

.github/CONTRIBUTING.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
### First off, thanks for taking the time to contribute!
2+
3+
For the contribution guide [click here](http://laradock.io/contributing/).

.github/ISSUE_TEMPLATE.md

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,19 @@
55
- System info disto/version:
66

77
### Issue:
8-
##### What seems to be going wrong?
9-
8+
<!--- What seems to be wrong? -->
109
_____
1110

1211
### Expected behavior:
13-
##### What should be happening instead?
14-
12+
<!--- What should happen instead? -->
1513
_____
1614

1715
### Reproduce:
18-
##### How might we be able to reproduce the error?
19-
16+
<!--- How can we reproduce the error? -->
2017
_____
2118

2219
### Relevant Code:
2320

2421
```
25-
// place code here
22+
// place a code sample here
2623
```

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<!--- Thank you for contributing to Laradock -->
2+
3+
##### I completed the 3 steps below:
4+
5+
- [] I've read the [Contribution Guide](http://laradock.io/contributing).
6+
- [] I've updated the **documentation**. (refer to [this](http://laradock.io/contributing/#update-the-documentation-site) for how to do so).
7+
- [] I enjoyed my time contributing and making developer's life easier :)
File renamed without changes.

.github/README.md

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<p align="center">
2+
<img src="https://s19.postimg.org/jblfytw9f/laradock-logo.jpg" alt="Laradock Logo"/>
3+
</p>
4+
5+
<p align="center">A Docker PHP development environment that facilitates running PHP Apps on Docker</p>
6+
7+
<p align="center">
8+
<a href="https://travis-ci.org/laradock/laradock"><img src="https://travis-ci.org/laradock/laradock.svg?branch=master" alt="Build status"></a>
9+
<a href="https://github.com/laradock/laradock/stargazers"><img src="https://img.shields.io/github/stars/laradock/laradock.svg" alt="GitHub stars"></a>
10+
<a href="https://github.com/laradock/laradock/network"><img src="https://img.shields.io/github/forks/laradock/laradock.svg" alt="GitHub forks"></a>
11+
<a href="https://github.com/laradock/laradock/issues"><img src="https://img.shields.io/github/issues/laradock/laradock.svg" alt="GitHub issues"></a>
12+
<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>
13+
<a href="http://laradock.io/contributing"><img src="https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat" alt="contributions welcome"></a>
14+
</p>
15+
16+
<h4 align="center" style="color:#7d58c2">Use Docker First And Learn About It Later</h4>
17+
18+
<p align="center">
19+
<a href="https://zalt.me"><img src="http://forthebadge.com/images/badges/built-by-developers.svg" alt="forthebadge" width="240" ></a>
20+
</p>
21+
22+
23+
---
24+
25+
<p align="center">
26+
<a href="http://laradock.io">
27+
<img src="https://s19.postimg.org/ecnn9vdw3/Screen_Shot_2017-08-01_at_5.08.54_AM.png" width=300px" alt="Laradock Docs"/>
28+
</a>
29+
</p>
30+
31+
32+
## Credits
33+
34+
- [Mahmoud Zalt](https://github.com/Mahmoudz) @mahmoudz | [Twitter](https://twitter.com/Mahmoud_Zalt) | [Site](http://zalt.me)
35+
- [Bo-Yi Wu](https://github.com/appleboy) @appleboy | [Twitter](https://twitter.com/appleboy)
36+
- [Philippe Trépanier](https://github.com/philtrep) @philtrep
37+
- [Mike Erickson](https://github.com/mikeerickson) @mikeerickson
38+
- [Dwi Fahni Denni](https://github.com/zeroc0d3) @zeroc0d3
39+
- [Thor Erik](https://github.com/thorerik) @thorerik
40+
- [Winfried van Loon](https://github.com/winfried-van-loon) @winfried-van-loon
41+
- [TJ Miller](https://github.com/sixlive) @sixlive
42+
- [Yu-Lung Shao (Allen)](https://github.com/bestlong) @bestlong
43+
- [Milan Urukalo](https://github.com/urukalo) @urukalo
44+
- [Vince Chu](https://github.com/vwchu) @vwchu
45+
- Join Us.
46+
47+
## License
48+
49+
[MIT License](https://github.com/laradock/laradock/blob/master/LICENSE)

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
/logs
33
/data
44
.env
5-
/.project
5+
/.project
6+
.docker-sync

.travis.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,11 @@ env:
4141

4242
# Installing a newer Docker version
4343
before_install:
44+
- curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
45+
- sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
4446
- sudo apt-get update
45-
- sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-engine
47+
- sudo apt-get -y install docker-ce
48+
- docker version
4649

4750
script: ./travis-build.sh
4851

0 commit comments

Comments
 (0)