chore(terraform): introduce the terraform submodule

observeinc · Aug 21, 2023 · 6ce84fe · 6ce84fe
1 parent df05134
commit 6ce84fe
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "cloudformation-aws-collection"]
 	path = cloudformation-aws-collection
 	url = [email protected]:observeinc/cloudformation-aws-collection.git
+[submodule "terraform-aws-collection"]
+	path = terraform-aws-collection
+	url = [email protected]:observeinc/terraform-aws-collection.git
diff --git a/Makefile b/Makefile
@@ -36,7 +36,7 @@ docker/build:
 	@if [ -z "$(shell docker images -q $(IMAGE_NAME))" ]; then \
 		echo "Image does not exist. Building..."; \
 		if [ "$(DOCKER_CMD)" = "buildx" ]; then \
-			git_branch=$$(git rev-parse --abbrev-ref HEAD) && \
+			git_branch=$$(git rev-parse --abbrev-ref HEAD | sed 's/\//-/g') && \
 			docker buildx build --load \
 			--cache-from=$(IMAGE_REPO):latest \
 			--cache-from=$(IMAGE_REPO):main \

diff --git a/terraform-aws-collection b/terraform-aws-collection