Skip to content

Commit 8c54ea7

Browse files
committed
Fixed xdebug version; changed readme.
1 parent 1707c2c commit 8c54ea7

File tree

4 files changed

+90
-25
lines changed

4 files changed

+90
-25
lines changed

.provision/nginx/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
FROM nginx:1.14
1+
FROM nginx:stable

.provision/php-fpm/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ RUN docker-php-ext-install exif && \
4343
--enable-exif
4444

4545
# Install the xdebug extension
46-
RUN pecl install xdebug && docker-php-ext-enable xdebug
46+
RUN pecl install xdebug-2.9.8 && docker-php-ext-enable xdebug
4747
# Copy xdebug configration for remote debugging
4848
COPY ./xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini
4949

README.md

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,17 @@
22
Docker environment configuration for Laravel development.
33
Contains settings for local development for new project or already existing.
44
>Repository provides:
5-
> - Laravel 6
6-
> - PHP 7.4
7-
> - Nginx: 1.14
8-
> - MySql 8.0
9-
> - Redis
10-
> - Node latest
11-
> - LetsEncrypt for production
5+
- Laravel ^8.0
6+
- PHP 7.4
7+
- Nginx: stable
8+
- MySql 8.0
9+
- Xdebug 2.9.8
10+
- Redis
11+
- Node: latest
12+
- LetsEncrypt for production
1213

1314
### Installation
14-
**Note:** Local environment tested only on Ubuntu. Feel free to create an Issue for other OS.
15+
**Note:** Local environment tested on Ubuntu and macOS. Feel free to create an Issue for other OS.
1516
1. **Clone repository**
1617
````
1718
mkdir {YOUR_NEW_FOLDER}
@@ -25,29 +26,31 @@ Contains settings for local development for new project or already existing.
2526
Set `PROJECT_NAME` variable.
2627
Set `PROJECT_FOLDER` variable for example 'backend' or whatever you want. By default it is `main`.
2728
28-
3. **Install Application**
29-
Install or copy your existing application to `PROJECT_FOLDER`.
30-
````
31-
# Install new
32-
composer create-project --prefer-dist laravel/laravel `PROJECT_FOLDER`
33-
````
29+
3430
3. **Configure main `docker-compose.yml` file**
3531
````
3632
# Local development
3733
cp docker-compose.yml.local docker-compose.yml
3834
````
39-
Set variables for mysql container. Docker will create database and user at first UP.
35+
Set variables for mysql container. Docker will create database and user at first UP.
4036
````
4137
MYSQL_ROOT_PASSWORD:
4238
MYSQL_DATABASE: ${PROJECT_NAME}
4339
MYSQL_USER: ${PROJECT_NAME}
4440
MYSQL_PASSWORD:
4541
````
42+
43+
3. **Install Application**
44+
Install or copy your existing application to `PROJECT_FOLDER`.
45+
````
46+
# Run containers
47+
docker-compose up -d --build
48+
# Install new
49+
docker-compose exec php-fpm composer create-project --prefer-dist laravel/laravel .
50+
````
51+
4652
4. **Configure Application `.env`**
47-
````
48-
# By default ${PROJECT_FOLDER}=main
49-
cp ${PROJECT_FOLDER}/.env.example cp ${PROJECT_FOLDER}/.env
50-
````
53+
5154
Set variables from *step 3*
5255
````
5356
DB_HOST=mysql
@@ -58,10 +61,9 @@ Contains settings for local development for new project or already existing.
5861
5. **Run Application**
5962
````
6063
# Run containers
61-
docker-compose up -d --build
64+
docker-compose up -d
6265

63-
docker-compose exec php-fpm php artisan key:generate
64-
# Base UI
66+
# Base UI. If needed!
6567
docker-compose exec -uwww-data php-fpm composer require laravel/ui --dev
6668
docker-compose exec -uwww-data php-fpm php artisan ui bootstrap --auth
6769

main/README.md

Lines changed: 64 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,64 @@
1-
Your laravel App here
1+
<p align="center"><a href="https://laravel.com" target="_blank"><img src="https://raw.githubusercontent.com/laravel/art/master/logo-lockup/5%20SVG/2%20CMYK/1%20Full%20Color/laravel-logolockup-cmyk-red.svg" width="400"></a></p>
2+
3+
<p align="center">
4+
<a href="https://travis-ci.org/laravel/framework"><img src="https://travis-ci.org/laravel/framework.svg" alt="Build Status"></a>
5+
<a href="https://packagist.org/packages/laravel/framework"><img src="https://img.shields.io/packagist/dt/laravel/framework" alt="Total Downloads"></a>
6+
<a href="https://packagist.org/packages/laravel/framework"><img src="https://img.shields.io/packagist/v/laravel/framework" alt="Latest Stable Version"></a>
7+
<a href="https://packagist.org/packages/laravel/framework"><img src="https://img.shields.io/packagist/l/laravel/framework" alt="License"></a>
8+
</p>
9+
10+
## About Laravel
11+
12+
Laravel is a web application framework with expressive, elegant syntax. We believe development must be an enjoyable and creative experience to be truly fulfilling. Laravel takes the pain out of development by easing common tasks used in many web projects, such as:
13+
14+
- [Simple, fast routing engine](https://laravel.com/docs/routing).
15+
- [Powerful dependency injection container](https://laravel.com/docs/container).
16+
- Multiple back-ends for [session](https://laravel.com/docs/session) and [cache](https://laravel.com/docs/cache) storage.
17+
- Expressive, intuitive [database ORM](https://laravel.com/docs/eloquent).
18+
- Database agnostic [schema migrations](https://laravel.com/docs/migrations).
19+
- [Robust background job processing](https://laravel.com/docs/queues).
20+
- [Real-time event broadcasting](https://laravel.com/docs/broadcasting).
21+
22+
Laravel is accessible, powerful, and provides tools required for large, robust applications.
23+
24+
## Learning Laravel
25+
26+
Laravel has the most extensive and thorough [documentation](https://laravel.com/docs) and video tutorial library of all modern web application frameworks, making it a breeze to get started with the framework.
27+
28+
If you don't feel like reading, [Laracasts](https://laracasts.com) can help. Laracasts contains over 1500 video tutorials on a range of topics including Laravel, modern PHP, unit testing, and JavaScript. Boost your skills by digging into our comprehensive video library.
29+
30+
## Laravel Sponsors
31+
32+
We would like to extend our thanks to the following sponsors for funding Laravel development. If you are interested in becoming a sponsor, please visit the Laravel [Patreon page](https://patreon.com/taylorotwell).
33+
34+
### Premium Partners
35+
36+
- **[Vehikl](https://vehikl.com/)**
37+
- **[Tighten Co.](https://tighten.co)**
38+
- **[Kirschbaum Development Group](https://kirschbaumdevelopment.com)**
39+
- **[64 Robots](https://64robots.com)**
40+
- **[Cubet Techno Labs](https://cubettech.com)**
41+
- **[Cyber-Duck](https://cyber-duck.co.uk)**
42+
- **[Many](https://www.many.co.uk)**
43+
- **[Webdock, Fast VPS Hosting](https://www.webdock.io/en)**
44+
- **[DevSquad](https://devsquad.com)**
45+
- **[Curotec](https://www.curotec.com/services/technologies/laravel/)**
46+
- **[OP.GG](https://op.gg)**
47+
- **[WebReinvent](https://webreinvent.com/?utm_source=laravel&utm_medium=github&utm_campaign=patreon-sponsors)**
48+
- **[Lendio](https://lendio.com)**
49+
50+
## Contributing
51+
52+
Thank you for considering contributing to the Laravel framework! The contribution guide can be found in the [Laravel documentation](https://laravel.com/docs/contributions).
53+
54+
## Code of Conduct
55+
56+
In order to ensure that the Laravel community is welcoming to all, please review and abide by the [Code of Conduct](https://laravel.com/docs/contributions#code-of-conduct).
57+
58+
## Security Vulnerabilities
59+
60+
If you discover a security vulnerability within Laravel, please send an e-mail to Taylor Otwell via [[email protected]](mailto:[email protected]). All security vulnerabilities will be promptly addressed.
61+
62+
## License
63+
64+
The Laravel framework is open-sourced software licensed under the [MIT license](https://opensource.org/licenses/MIT).

0 commit comments

Comments
 (0)