merge remote master branch

Author: gegere

Dockerfile

@@ -1,4 +1,3 @@
-# Use a more recent base image
 FROM ubuntu:20.04
 
 # Metadata as defined at http://label-schema.org

Makefile

@@ -68,7 +68,7 @@ run:
 	@echo "	THE PASSWORD FOR ${bold}$(MYSQL_USER)${normal} IS ${bold}$(MYSQL_PASSWORD)${normal};"
 	@echo ''
 	@echo "	docker exec -it apache_db /bin/bash \n \
-		mysql -p \n \
+		mysql -p '$(MYSQL_ROOT_PASSWORD)' \n \
 		GRANT ALL PRIVILEGES ON * . * TO '$(MYSQL_USER)'@'%' with grant option; \n"
 
 	docker-compose -f $(COMPOSE_FILE) up -d --remove-orphans

README.md

@@ -70,16 +70,16 @@ Open `docker-compose.local.yml` and review [this line](https://github.com/htmlgr
 ### Windows
 
 ```bash
-~ git clone https://github.com/htmlgraphic/Apache.git ~/Docker/Apache; cd ~/Docker/Apache
-~ copy .env.example .env
-~ docker-compose -f docker-compose.local.yml up -d
+> git clone git@github.com:htmlgraphic/Apache.git ~/Docker/Apache; cd ~/Docker/Apache
+> copy .env.example .env
+> docker-compose -f docker-compose.local.yml up -d
 ```
 
 >	Optional, are you having problems on Windows? Disable Firewall
 
 ```bash
-~ netsh advfirewall show currentprofile
-~ netsh advfirewall set allprofiles state off
+> netsh advfirewall show currentprofile
+> netsh advfirewall set allprofiles state off
 ```
 
 

docker-compose.local.yml

@@ -5,7 +5,7 @@ services:
     restart: unless-stopped
     container_name: apache
     volumes:
-      - '~/SITES/docker:/data' # Preferred local working dir
+      - '~/SITES/docker:/data' # <- Change to preferred local working dir
      #- '/c/Users/southpark/docker:/data'
     links:
       - 'db:mysql'