adding phpmyadmin instructions, better documentation / install guide

Author: gegere

.env.example

@@ -1,3 +1,7 @@
+MYSQL_DATABASE=htmlgraphic
+MYSQL_PASSWORD=new_password
+MYSQL_ROOT_PASSWORD=new_passwordac
+MYSQL_USER=admin
 SASL_USER=p08tf1X
 SASL_PASS=p@ssw0Rd
 SMTP_HOST=email-test.htmlgraphic.com

Makefile

@@ -6,6 +6,8 @@ NAME 		= apache
 IMAGE_REPO 	= htmlgraphic
 IMAGE_NAME 	= $(IMAGE_REPO)/$(NAME)
 DOMAIN 		= htmlgraphic.com
+include .env
+
 
 all:: help
 
@@ -24,23 +26,33 @@ help:
 	@echo "     make state		- View state $(NAME) container"
 	@echo "     make logs		- View logs in real time"
 
+
+env:
+	@echo $(shell sed 's/=.*//' .env)
+
 build:
 	docker build \
-        --build-arg VCS_REF=`git rev-parse --short HEAD` \
-        --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
-        --rm -t $(IMAGE_NAME):$(VERSION) -t $(IMAGE_NAME):envoyer .
+		--build-arg VCS_REF=`git rev-parse --short HEAD` \
+		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
+		--rm -t $(IMAGE_NAME):$(VERSION) -t $(IMAGE_NAME):envoyer .
 
 push:
 	@echo "note: If the repository is set as an automatted build you will NOT be able to push"
 	docker push $(IMAGE_NAME):$(VERSION)
 
 run:
-	[ ! -f .env ] && echo '.env file does not exist, copy env template' && cp .env.example .env || echo "env file exists"
-	@echo "# Upon initial setup run the following on the MySQL system:"
+	@echo 'Checking... for initial folder structure:'
+	@if [ ! -d "/Volumes/Case" ]; then \
+		echo "		Creating project folders" && sudo mkdir -p /Volumes/Case && sudo mkdir -p /Volumes/Case/SITES && sudo mkdir -p /Volumes/Case/SITES/docker; fi
+	@[ ! -f .env ] && echo "		.env file does not exist, copy env template" && cp .env.example .env || echo "		env file exists"
 	@echo ""
-	@echo "mysql -p <MYSQL_ROOT_PASSWORD>"
-	@echo "GRANT ALL PRIVILEGES ON * . * TO 'admin'@'%' with grant option;"
+	@echo "Upon initial setup run the following on the MySQL system, this will setup a GLOBAL admin:"
 	@echo ""
+	@echo "		docker exec -it apache_db_1 /bin/bash \n \
+			mysql -p$(MYSQL_ROOT_PASSWORD) \n \
+			GRANT ALL PRIVILEGES ON * . * TO '$(MYSQL_USER)'@'%' with grant option; \n"
+
+	@echo "		THE PASSWORD FOR $(MYSQL_USER) IS $(MYSQL_PASSWORD); \n"
 	docker-compose -f docker-compose.local.yml up -d
 
 start: run
@@ -52,14 +64,14 @@ stop:
 restart:	stop start
 
 rm:
-	@echo "# As a precautionary measure containers are specifally referenced to not destroy DB data"
-	@echo "Removing $(NAME)_web_1 and $(NAME)_db_1"
-	docker rm -f $(NAME)_web_1
+	@echo "On remove, containers are specifally referenced, as to not destroy ANY persistent data"
+	@echo "Removing $(NAME) and $(NAME)_db_1"
+	docker rm -f $(NAME)
 	docker rm -f $(NAME)_db_1
 
 state:
-	docker ps -a | grep $(NAME)_web_1
+	docker ps -a | grep $(NAME)
 
 logs:
 	@echo "Build $(NAME)..."
-	docker logs -f $(NAME)_web_1
+	docker logs -f $(NAME)

README.md

@@ -12,8 +12,7 @@ This repo will give you a turn key Docker container build for use in production
 If you found this repo you are probably looking into Docker or already have knowledge as to what Docker can help you with. In this repo you will find a number of complete Dockerfile builds used in **development** and **production** environments. Listed below is an explanation of each file. [Ask a question](https://github.com/htmlgraphic/Apache/issues/new)
 
 #### Dependencies
-- Docker
-- Docker Compose
+- Docker [Download](https://www.docker.com/community-edition#/download)
 - Git
 - Make ([Windows](https://stackoverflow.com/questions/32127524/how-to-install-and-use-make-in-windows-8-1))
 
@@ -45,17 +44,33 @@ Apache                       # → Root of Docker Build
 ```
 Docker Compose YML configuration guide [more info](https://docs.docker.com/docker-cloud/apps/deploy-to-cloud-btn/) 
 
+
 ## Quick Start
 
-Launch the **Apache** instance locally and setup a local MySQL database container for persistant database data, the goal is to create a easy to use development environment. Type `make` for more build options
+Launch the **Apache** instance locally and setup a local MySQL database container for persistant database data, the goal is to create a easy to use development environment. 
+
+>	Type `make` for more build options:
 
 ```bash
-	$ git clone https://github.com/htmlgraphic/Apache.git && cd Apache
+	$ git clone https://github.com/htmlgraphic/Apache.git ~/Docker/Apache && cd ~/Docker/Apache
 	$ make run 
+
 	OR (non Make Windows)
+
 	$ docker-compose -f docker-compose.local.yml up -d
 ```
 
+### Run phpMyAdmin
+
+Review MySQL access instructions upon `make run` command execution
+
+```bash
+	$ docker run --name myadmin -d --link apache_db_1:db --net apache_default -p 8080:80 phpmyadmin/phpmyadmin
+
+	Open http://localhost:8080 (username & password are set within .env file)
+```
+
+
 ---
 ## Deploy to Docker Cloud
 Create a [Docker Cloud](https://cloud.docker.com) account, add a   **Cloud provider**. Once complete, `one click` will create a functional Apache & MySQL Service.

docker-compose.local.yml

@@ -21,10 +21,7 @@ services:
       - "db-data:/var/lib/mysql"
     ports:
       - "3306:3306"
-    environment:
-      - MYSQL_ROOT_PASSWORD=new_passwordac
-      - MYSQL_DATABASE=htmlgraphic
-      - MYSQL_USER=admin
-      - MYSQL_PASSWORD=new_password
+    env_file:
+      - .env
 volumes:
   db-data: