#334 Fix docker build process (#348)

senzing-garage · Oct 21, 2024 · 64474ba · 64474ba
1 parent bfa734e
commit 64474ba
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 25 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -7,6 +7,6 @@ docs/
 CHANGELOG.md
 CODE_OF_CONDUCT.md
 CONTRIBUTING.md
-docker-compose.test.yml
+docker-compose.test.yaml
 LICENSE
 README.md
diff --git a/makefiles/darwin.mk b/makefiles/darwin.mk
@@ -17,10 +17,6 @@ SENZING_TOOLS_DATABASE_URL ?= sqlite3://na:na@nowhere/tmp/sqlite/G2C.db
 # OS specific targets
 # -----------------------------------------------------------------------------
 
-.PHONY: build-osarch-specific
-build-osarch-specific: darwin/amd64
-
-
 .PHONY: clean-osarch-specific
 clean-osarch-specific:
 	@docker rm  --force $(DOCKER_CONTAINER_NAME) 2> /dev/null || true
@@ -49,14 +45,6 @@ dependencies-for-development-osarch-specific:
 	@curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell go env GOPATH)/bin latest
 
 
-.PHONY: docker-build-osarch-specific
-docker-build-osarch-specific:
-	@docker build \
-		--tag $(DOCKER_IMAGE_NAME) \
-		--tag $(DOCKER_IMAGE_NAME):$(BUILD_VERSION) \
-		.
-
-
 .PHONY: documentation-osarch-specific
 documentation-osarch-specific:
 	@pkill godoc || true

diff --git a/makefiles/darwin_x86_64.mk b/makefiles/darwin_x86_64.mk
@@ -7,6 +7,15 @@
 .PHONY: build-osarch-specific
 build-osarch-specific: darwin/amd64
 
+
+.PHONY: docker-build-osarch-specific
+docker-build-osarch-specific:
+	@docker build \
+		--platform linux/amd64 \
+		--tag $(DOCKER_IMAGE_NAME) \
+		--tag $(DOCKER_IMAGE_NAME):$(BUILD_VERSION) \
+		.
+
 # -----------------------------------------------------------------------------
 # Makefile targets supported only by this platform.
 # -----------------------------------------------------------------------------

diff --git a/makefiles/linux.mk b/makefiles/linux.mk
@@ -12,10 +12,6 @@ PATH := $(MAKEFILE_DIRECTORY)/bin:/$(HOME)/go/bin:$(PATH)
 # OS specific targets
 # -----------------------------------------------------------------------------
 
-.PHONY: build-osarch-specific
-build-osarch-specific: linux/amd64
-
-
 .PHONY: clean-osarch-specific
 clean-osarch-specific:
 	@docker rm  --force $(DOCKER_CONTAINER_NAME) 2> /dev/null || true
@@ -44,14 +40,6 @@ dependencies-for-development-osarch-specific:
 	@curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell go env GOPATH)/bin latest
 
 
-.PHONY: docker-build-osarch-specific
-docker-build-osarch-specific:
-	@$(DOCKER_BUILDKIT) docker build \
-		--tag $(DOCKER_IMAGE_NAME) \
-		--tag $(DOCKER_IMAGE_NAME):$(BUILD_VERSION) \
-		.
-
-
 .PHONY: documentation-osarch-specific
 documentation-osarch-specific:
 	@pkill godoc || true

diff --git a/makefiles/linux_x86_64.mk b/makefiles/linux_x86_64.mk
@@ -9,6 +9,15 @@ build-osarch-specific: linux/amd64
 	@mkdir -p $(TARGET_DIRECTORY)/linux
 	@cp $(TARGET_DIRECTORY)/linux-amd64/$(PROGRAM_NAME) $(TARGET_DIRECTORY)/linux/$(PROGRAM_NAME)
 
+
+.PHONY: docker-build-osarch-specific
+docker-build-osarch-specific:
+	@docker build \
+		--platform linux/amd64 \
+		--tag $(DOCKER_IMAGE_NAME) \
+		--tag $(DOCKER_IMAGE_NAME):$(BUILD_VERSION) \
+		.
+
 # -----------------------------------------------------------------------------
 # Makefile targets supported only by this platform.
 # -----------------------------------------------------------------------------