docs(docker): updated docker docs

Author: xmlking

Makefile

@@ -107,25 +107,6 @@ proto proto-%:
 	fi
 	@rsync -a github.com/xmlking/micro-starter-kit/service/account/proto/ service/account/proto && rm -Rf github.com
 
-proto2 proto2-%:
-	@if [ -z $(TARGET) ]; then \
-		for d in $(TYPES); do \
-			for f in $$d/**/proto/**/*.proto; do \
-				protoc --proto_path=.:${GOPATH}/src \
-				--go_out=paths=source_relative:. \
-				--validate_out=lang=go,paths=source_relative:. $$f; \
-				echo ✓ compiled: $$f; \
-			done \
-		done \
-	else \
-		for f in ${TYPE}/${TARGET}/proto/**/*.proto; do \
-			protoc --proto_path=.:${GOPATH}/src \
-			--go_out=plugins=grpc,paths=source_relative:. \
-			--validate_out=lang=go,paths=source_relative:. $$f; \
-			echo ✓ compiled: $$f; \
-		done \
-	fi
-
 proto_shared:
 	@for f in ./shared/proto/**/*.proto; do \
 		protoc --proto_path=.:${GOPATH}/src \
@@ -308,13 +289,13 @@ docker_push:
 		docker push $$image; \
 	done;
 
-kustomize: OVERLAY 	:= e2e
+kustomize: OVERLAY 	:= local
 kustomize: NS 			:= default
 kustomize:
-	# @kustomize build deploy/overlays/${OVERLAY}/ | sed -e "s|\$$(NS)|${NS}|g" -e "s|\$$(IMAGE_VERSION)|${VERSION}|g" | kubectl apply -f -
-	@kustomize build deploy/overlays/${OVERLAY}/ | sed -e "s|\$$(NS)|${NS}|g" 	-e "s|\$$(IMAGE_VERSION)|${VERSION}|g" > build/deploy.yaml
+	# @kustomize build --load_restrictor none config/envs/${OVERLAY}/ | sed -e "s|\$$(NS)|${NS}|g" 		-e "s|\$$(IMAGE_VERSION)|${VERSION}|g" | kubectl apply -f -
+	@kustomize build --load_restrictor none config/envs/${OVERLAY}/ | sed -e "s|\$$(NS)|${NS}|g" 		-e "s|\$$(IMAGE_VERSION)|${VERSION}|g" > build/kubernetes.yaml
 
 build/kustomize: check_dirty
-	@kustomize build deploy/overlays/e2e/ 			 | sed -e "s|\$$(NS)|default|g" -e "s|\$$(IMAGE_VERSION)|${VERSION}|g" > build/deploy.e2e.yaml
-	@kustomize build deploy/overlays/production/ | sed -e "s|\$$(NS)|default|g" -e "s|\$$(IMAGE_VERSION)|${VERSION}|g" > build/deploy.production.yaml
-	@kustomize build deploy/overlays/production/ | sed -e "s|\$$(NS)|mynamespace|g" 	-e "s|\$$(IMAGE_VERSION)|${VERSION}|g" > build/deploy.production.mynamespace.yaml
+	@kustomize build --load_restrictor none config/envs/local  		| sed -e "s|\$$(NS)|default|g" 		-e "s|\$$(IMAGE_VERSION)|${VERSION}|g" > build/kubernetes.local.yaml
+	@kustomize build --load_restrictor none config/envs/production/ | sed -e "s|\$$(NS)|default|g" 		-e "s|\$$(IMAGE_VERSION)|${VERSION}|g" > build/kubernetes.production.yaml
+	@kustomize build --load_restrictor none config/envs/production/ | sed -e "s|\$$(NS)|mynamespace|g" 	-e "s|\$$(IMAGE_VERSION)|${VERSION}|g" > build/kubernetes.production.mynamespace.yaml

config/envs/local/kustomization.yaml

@@ -59,6 +59,9 @@ images:
     newTag: v0.10.1
   - name: postgres
     newTag: 11.5-alpine
+  - name: envoyproxy/envoy-alpine
+    newName: docker.io/envoyproxy/envoy-alpine
+    newTag: v1.14.1
   - name: micro/micro
     newName: docker.pkg.github.com/xmlking/micro-starter-kit/micro
     newTag: v2.0.0

docs/devops/docker.md

@@ -94,3 +94,18 @@ kubectl run --rm mygateway --image=micro/micro:latest \
 --restart=Never -it \
 --command ./micro api
 ```
+
+## Cleanup
+
+[Removing Docker Containers and Images](https://dbaontap.com/2017/04/16/removing-docker-containers-images/)
+
+```bash
+docker images
+# Remove Docker Containers
+docker rmi <image id>
+# Stop & Remove All Docker Containers
+docker stop $(docker ps -a -q)
+docker rm $(docker ps -a -q) 
+make docker_clean
+```
+ 

docs/introduction/makefile.md

@@ -122,6 +122,8 @@ make release VERSION=v0.1.1 GITHUB_TOKEN=123...
 
 ### docker
 
+Optionally set `export DOCKER_BUILDKIT=1` to use `moby`
+
 ```bash
 make docker-account VERSION=v0.1.1
 make docker-account-service VERSION=v0.1.1

go.mod

@@ -9,6 +9,7 @@ replace google.golang.org/grpc => google.golang.org/grpc v1.26.0
 // replace github.com/xmlking/configor => /Users/schintha/Developer/Work/go/configor
 
 require (
+	github.com/DATA-DOG/go-sqlmock v1.4.1 // indirect
 	github.com/envoyproxy/protoc-gen-validate v0.1.0
 	github.com/gogo/protobuf v1.3.1
 	github.com/golang/protobuf v1.4.2

go.sum

@@ -27,6 +27,7 @@ github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6L
 github.com/Azure/go-autorest/tracing v0.1.0/go.mod h1:ROEEAFwXycQw7Sn3DXNtEedEvdeRAgDr0izn4z5Ij88=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
+github.com/DATA-DOG/go-sqlmock v1.4.1/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
 github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw=
 github.com/Microsoft/hcsshim v0.8.7-0.20191101173118-65519b62243c/go.mod h1:7xhjOwRV2+0HXGmM0jxaEu+ZiXJFoVZOTfL/dmqbrD8=
 github.com/OpenDNS/vegadns2client v0.0.0-20180418235048-a3fa4a771d87/go.mod h1:iGLljf5n9GjT6kc0HBvyI1nOKnGQbNB66VzSNbK5iks=

scripts/kustomize.sh

@@ -9,7 +9,7 @@ echo "Deploying micro-starter-kit..."
 
 # Set the image tag to the sha hash that we just built in the previous stage.
 # K8S will do a rolling deployment
-(   cd deploy/overlays/production;  \
+(   cd config/envs/production;  \
     kustomize edit set docker.pkg.github.com/xmlking/micro-starter-kit/greeter-service:"$SHORT_SHA" && \
     kustomize edit set namespace $NS  && \
     kustomize build | \