Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#162 Delete System Unit Test (sut) image #168

Merged
merged 2 commits into from
Sep 10, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
#162 Delete System Unit Test (sut) image
  • Loading branch information
docktermj committed Sep 9, 2024
commit b603fe149f4f19ac892b23d13fd09aa3c2ce15ba
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ BUILD_VERSION := $(shell git describe --always --tags --abbrev=0 --dirty | sed
DOCKER_CONTAINER_NAME := $(PROGRAM_NAME)
DOCKER_IMAGE_NAME := senzing/$(PROGRAM_NAME)
DOCKER_BUILD_IMAGE_NAME := $(DOCKER_IMAGE_NAME)-build
DOCKER_SUT_IMAGE_NAME := $(PROGRAM_NAME)_sut
GIT_REMOTE_URL := $(shell git config --get remote.origin.url)
GIT_REPOSITORY_NAME := $(shell basename `git rev-parse --show-toplevel`)
GIT_VERSION := $(shell git describe --always --tags --long --dirty | sed -e 's/\-0//' -e 's/\-g.......//')
Expand Down
2 changes: 1 addition & 1 deletion makefiles/darwin.mk
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ build-osarch-specific: darwin/amd64
.PHONY: clean-osarch-specific
clean-osarch-specific:
@docker rm --force $(DOCKER_CONTAINER_NAME) 2> /dev/null || true
@docker rmi --force $(DOCKER_IMAGE_NAME) $(DOCKER_BUILD_IMAGE_NAME) 2> /dev/null || true
@docker rmi --force $(DOCKER_IMAGE_NAME) $(DOCKER_BUILD_IMAGE_NAME) $(DOCKER_SUT_IMAGE_NAME) 2> /dev/null || true
@rm -f $(GOPATH)/bin/$(PROGRAM_NAME) || true
@rm -f $(MAKEFILE_DIRECTORY)/.coverage || true
@rm -f $(MAKEFILE_DIRECTORY)/coverage.html || true
Expand Down
2 changes: 1 addition & 1 deletion makefiles/darwin_arm64.mk
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ build-osarch-specific: darwin/arm64
.PHONY: docker-build-osarch-specific
docker-build-osarch-specific:
@docker build \
--platform linux/amd64 \
--platform linux/arm64 \
--tag $(DOCKER_IMAGE_NAME) \
--tag $(DOCKER_IMAGE_NAME):$(BUILD_VERSION) \
.
Expand Down
2 changes: 1 addition & 1 deletion makefiles/linux.mk
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ build-osarch-specific: linux/amd64
.PHONY: clean-osarch-specific
clean-osarch-specific:
@docker rm --force $(DOCKER_CONTAINER_NAME) 2> /dev/null || true
@docker rmi --force $(DOCKER_IMAGE_NAME) $(DOCKER_BUILD_IMAGE_NAME) 2> /dev/null || true
@docker rmi --force $(DOCKER_IMAGE_NAME) $(DOCKER_BUILD_IMAGE_NAME) $(DOCKER_SUT_IMAGE_NAME) 2> /dev/null || true
@rm -f $(GOPATH)/bin/$(PROGRAM_NAME) || true
@rm -f $(MAKEFILE_DIRECTORY)/.coverage || true
@rm -f $(MAKEFILE_DIRECTORY)/coverage.html || true
Expand Down
2 changes: 1 addition & 1 deletion makefiles/linux_arm64.mk
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ build-osarch-specific: linux/arm64
.PHONY: docker-build-osarch-specific
docker-build-osarch-specific:
@docker build \
--platform linux/amd64 \
--platform linux/arm64 \
--tag $(DOCKER_IMAGE_NAME) \
--tag $(DOCKER_IMAGE_NAME):$(BUILD_VERSION) \
.
Expand Down
Loading