ref(*): bundle reorg/cleanup

- Ensure bundle.json and Dockerfile are located at bundle's root - Remove Makefile from bundle if trivial/default (targets will be placed in root-level Makefile)
deislabs · Nov 20, 2018 · fa13bb7 · fa13bb7
1 parent 523efbe
commit fa13bb7
Show file tree

Hide file tree

Showing 17 changed files with 3 additions and 144 deletions.
diff --git a/aks-terraform/Makefile b/aks-terraform/Makefile
diff --git a/aks/cnab/Dockerfile → aks/Dockerfile b/aks/cnab/Dockerfile → aks/Dockerfile
diff --git a/ansible-azurevm/Makefile b/ansible-azurevm/Makefile
diff --git a/ansiblebase/Makefile b/ansiblebase/Makefile
diff --git a/arm-aci/Makefile b/arm-aci/Makefile
diff --git a/armbase/Makefile b/armbase/Makefile
@@ -25,14 +25,9 @@ build:
 cxbuild:
 	GOOS=linux GOARCH=amd64 go build $(GOFLAGS) -o cnab/app/armup -ldflags '$(LDFLAGS)' ./...
 
-.PHONY: docker-build
-docker-build: cxbuild
-docker-build:
-	docker build -t cnab/armbase:0.1.0 .
-	docker tag cnab/armbase:0.1.0 cnab/armbase:latest
-
-docker-push:
-	docker push cnab/armbase
+# Note: to build/push the Docker image for this bundle,
+# call the root Makefile's targets from the root of this project , e.g.
+# BUNDLE=armbase make docker-build
 
 .PHONY: test
 test:

diff --git a/compose/Makefile b/compose/Makefile
diff --git a/helloazure/cnab/bundle.json → helloazure/bundle.json b/helloazure/cnab/bundle.json → helloazure/bundle.json
diff --git a/helloworld/Makefile b/helloworld/Makefile
diff --git a/k8sbase/Makefile b/k8sbase/Makefile
diff --git a/makebase/Makefile b/makebase/Makefile
diff --git a/pulumibase/Makefile b/pulumibase/Makefile
diff --git a/terraform/Makefile b/terraform/Makefile
diff --git a/wordpress-mysql/cnab/Dockerfile → wordpress-mysql/Dockerfile b/wordpress-mysql/cnab/Dockerfile → wordpress-mysql/Dockerfile
diff --git a/wordpress-mysql/Makefile b/wordpress-mysql/Makefile
diff --git a/wordpress/cnab/Dockerfile → wordpress/Dockerfile b/wordpress/cnab/Dockerfile → wordpress/Dockerfile
diff --git a/wordpress/Makefile b/wordpress/Makefile