Skip to content

Commit

Permalink
Merge branch 'master' into webstack/v2.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
nspalo authored Aug 23, 2021
2 parents 5513da4 + 29ddf12 commit 24f78e5
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Docker Study
> This is a simple repo to learn the basics in setting up a
> *Web development environment with NginX, MySQL, and PHP inside a __Docker__ container*.
> *Web development environment with NginX, MySQL, PHP, and Laravel 5.8 inside a __Docker__ container*.
## Web Stack
- Docker Containers
Expand All @@ -11,12 +11,13 @@
- nginx:stable-alpine
- MySQL 5.7
- mysql:5.7.22
- PHP 7
- PHP 7.4
- php:7.4-fpm-alpine
- Laravel 5.8

## Table of Contents
| Branch Name | What's Inside |
| ------------- | ------------- |
| webstack/v1.0.0 | nginx:stable-alpine, mysql:5.7.22, php:7.2-fpm-alpine |
| webstack/v2.0.0 | nginx:stable-alpine, mysql:5.7.22, php:7.4-fpm-alpine |
| webstack/v2.1.0 | nginx:stable-alpine, mysql:5.7.22, php:7.4-fpm-alpine, laravel 5.8 |
| [webstack/v1.0.0](https://github.com/nspalo/docker-study/tree/webstack/v1.0.0) | nginx:stable-alpine, mysql:5.7.22, php:7.2-fpm-alpine |
| [webstack/v2.0.0](https://github.com/nspalo/docker-study/tree/webstack/v2.0.0) | nginx:stable-alpine, mysql:5.7.22, php:7.4-fpm-alpine |
| [webstack/v2.1.0](https://github.com/nspalo/docker-study/tree/webstack/v2.1.0) | nginx:stable-alpine, mysql:5.7.22, php:7.4-fpm-alpine, laravel 5.8 |

0 comments on commit 24f78e5

Please sign in to comment.