wip: use distinct names for dockerfiles

tophat · Mar 23, 2022 · ff3d6e7 · ff3d6e7
1 parent c905c58
commit ff3d6e7
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 4 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -12,5 +12,8 @@ max_line_length = off
 [*.yml]
 indent_size = 2
 
+[Makefile]
+indent_style = tab
+
 [{CHANGELOG.md,package.json,yarn.lock}]
 indent_size = false
diff --git a/client/Makefile b/client/Makefile
@@ -16,11 +16,11 @@ ifndef CI
 	@make package
 endif
 	@echo "Building Docker Container"
-	docker build . -t ghcr.io/tophat/sanity-runner-client
+	docker build . -f client.Dockerfile -t ghcr.io/tophat/sanity-runner-client
 
 .PHONY: package
 package:
-	yarn pkg . --out-path bin/ --targets "node16"
+	yarn workspace sanity-runner-client pkg . --out-path bin/ --targets "node16" --debug
 
 # ----- Helpers -----
 

diff --git a/client/Dockerfile → client/client.Dockerfile b/client/Dockerfile → client/client.Dockerfile
diff --git a/service/Makefile b/service/Makefile
@@ -33,7 +33,7 @@ dependencies:
 
 .PHONY: install
 install: clean
-    make terraform-dependencies
+	make terraform-dependencies
 	make dependencies
 
 # ----- Helpers -----
@@ -68,7 +68,7 @@ package: bundle build-docker
 .PHONY: build-docker
 build-docker:
 	@echo "Building Docker Container"
-	docker build ../ -f Dockerfile -t ghcr.io/tophat/sanity-runner-service
+	docker build ../ -f service.Dockerfile -t ghcr.io/tophat/sanity-runner-service
 
 .PHONY: publish-docker
 publish-docker:

diff --git a/service/Dockerfile → service/service.Dockerfile b/service/Dockerfile → service/service.Dockerfile
diff --git a/service/Dockerfile.dockerignore → service/service.Dockerfile.dockerignore b/service/Dockerfile.dockerignore → service/service.Dockerfile.dockerignore