Merge pull request aschmelyun#15 from aschmelyun/feature/php7-4

aschmelyun · web-flow · commit e107f6d73560 · 2020-03-15T15:09:13.000-04:00
Feature/php7 4
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.2-fpm-alpine
+FROM php:7.4-fpm-alpine
 
 WORKDIR /var/www/html
 
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ A pretty simplified docker-compose workflow that sets up a LEMP network of conta
 
 To get started, make sure you have [Docker installed](https://docs.docker.com/docker-for-mac/install/) on your system, and then clone this repository.
 
-Add your entire Laravel project to the `src` folder, then open a terminal and from this cloned respository's root run `docker-compose up -d --build`. Open up your browser of choice to [http://localhost:8080](http://localhost:8080) and you should see your Laravel app running as intended. 
+First add your entire Laravel project to the `src` folder, then open a terminal and from this cloned respository's root run `docker-compose up -d --build`. Open up your browser of choice to [http://localhost:8080](http://localhost:8080) and you should see your Laravel app running as intended. **Your Laravel app needs to be in the src directory first before bringing the containers up, otherwise the artisan container will not build, as it's missing the appropriate file.** 
 
 **New:** Three new containers have been added that handle Composer, NPM, and Artisan commands without having to have these platforms installed on your local computer. Use the following command templates from your project root, modifiying them to fit your particular use case:
 
@@ -21,4 +21,4 @@ Containers created and their ports (if used) are as follows:
 - **php** - `:9000`
 - **npm**
 - **composer**
-- **artisan**
+- **artisan**
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -19,7 +19,7 @@ services:
       - laravel
 
   mysql:
-    image: mysql:5.7.22
+    image: mysql:5.7.29
     container_name: mysql
     restart: unless-stopped
     tty: true
@@ -78,4 +78,4 @@ services:
     working_dir: /var/www/html
     entrypoint: ['/var/www/html/artisan']
     networks:
-      - laravel
+      - laravel

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM php:7.2-fpm-alpine`
	`1`	`+FROM php:7.4-fpm-alpine`
`2`	`2`
`3`	`3`	`WORKDIR /var/www/html`
`4`	`4`