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.

Sign up for GitHub

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

Fix Simplify containers makefile [SAME VERSION] #257

Merged
merged 1 commit into from
Feb 26, 2021
Merged

Fix Simplify containers makefile [SAME VERSION] #257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion build/akri-containers.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ install-cross:
.PHONY: akri
akri: akri-build akri-docker-all
akri-build: install-cross akri-cross-build
akri-docker-all: akri-controller akri-agent akri-udev akri-onvif akri-streaming akri-opcua-monitoring akri-anomaly-detection akri-webhook-configuration
akri-docker-all: akri-docker-controller akri-docker-agent akri-docker-udev akri-docker-onvif akri-docker-streaming akri-docker-opcua-monitoring akri-docker-anomaly-detection akri-docker-webhook-configuration

akri-cross-build: akri-cross-build-amd64 akri-cross-build-arm32 akri-cross-build-arm64
akri-cross-build-amd64:
Expand Down
12 changes: 3 additions & 9 deletions build/akri-dotnet-containers.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
define add_onvif_target
$(info compiling akri-$(1)) # logged when doing $(call ...)
$$(info evaluating akri-$(1)) # logged when doing $(eval $(call ...))

akri-$(1): akri-build akri-docker-$(1)
akri-docker-$(1): $(1)-build $(1)-docker-per-arch $(1)-docker-multi-arch-create $(1)-docker-multi-arch-push
$(1)-build: $(1)-build-amd64 $(1)-build-arm32 $(1)-build-arm64
Expand Down Expand Up @@ -50,9 +47,6 @@ define add_onvif_target
endef

define add_opcua_target
$(info compiling akri-$(1)) # logged when doing $(call ...)
$$(info evaluating akri-$(1)) # logged when doing $(eval $(call ...))

akri-$(1): akri-build akri-docker-$(1)
akri-docker-$(1): $(1)-build $(1)-docker-per-arch $(1)-docker-multi-arch-create $(1)-docker-multi-arch-push
$(1)-build: $(1)-build-amd64 $(1)-build-arm32 $(1)-build-arm64
Expand Down Expand Up @@ -86,13 +80,13 @@ define add_opcua_target

$(1)-docker-multi-arch-create:
ifeq (1, ${BUILD_AMD64})
$(ENABLE_DOCKER_MANIFEST) docker manifest create --amend $(PREFIX)/$(2):$(LABEL_PREFIX) $(PREFIX)/$(1):$(LABEL_PREFIX)-$(AMD64_SUFFIX)
$(ENABLE_DOCKER_MANIFEST) docker manifest create --amend $(PREFIX)/$(2):$(LABEL_PREFIX) $(PREFIX)/$(2):$(LABEL_PREFIX)-$(AMD64_SUFFIX)
endif
ifeq (1, ${BUILD_ARM32})
$(ENABLE_DOCKER_MANIFEST) docker manifest create --amend $(PREFIX)/$(2):$(LABEL_PREFIX) $(PREFIX)/$(1):$(LABEL_PREFIX)-$(ARM32V7_SUFFIX)
$(ENABLE_DOCKER_MANIFEST) docker manifest create --amend $(PREFIX)/$(2):$(LABEL_PREFIX) $(PREFIX)/$(2):$(LABEL_PREFIX)-$(ARM32V7_SUFFIX)
endif
ifeq (1, ${BUILD_ARM64})
$(ENABLE_DOCKER_MANIFEST) docker manifest create --amend $(PREFIX)/$(2):$(LABEL_PREFIX) $(PREFIX)/$(1):$(LABEL_PREFIX)-$(ARM64V8_SUFFIX)
$(ENABLE_DOCKER_MANIFEST) docker manifest create --amend $(PREFIX)/$(2):$(LABEL_PREFIX) $(PREFIX)/$(2):$(LABEL_PREFIX)-$(ARM64V8_SUFFIX)
endif

$(1)-docker-multi-arch-push:
Expand Down
9 changes: 3 additions & 6 deletions build/akri-python-containers.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@

define add_python_target
$(info compiling akri-$(1)) # logged when doing $(call ...)
$$(info evaluating akri-$(1)) # logged when doing $(eval $(call ...))

akri-$(1): akri-build akri-docker-$(1)
akri-docker-$(1): $(1)-build $(1)-docker-per-arch $(1)-docker-multi-arch-create $(1)-docker-multi-arch-push
$(1)-build: $(1)-build-amd64 $(1)-build-arm32 $(1)-build-arm64
Expand Down Expand Up @@ -36,13 +33,13 @@ define add_python_target

$(1)-docker-multi-arch-create:
ifeq (1, ${BUILD_AMD64})
$(ENABLE_DOCKER_MANIFEST) docker manifest create --amend $(PREFIX)/$(2):$(LABEL_PREFIX) $(PREFIX)/$(1):$(LABEL_PREFIX)-$(AMD64_SUFFIX)
$(ENABLE_DOCKER_MANIFEST) docker manifest create --amend $(PREFIX)/$(2):$(LABEL_PREFIX) $(PREFIX)/$(2):$(LABEL_PREFIX)-$(AMD64_SUFFIX)
endif
ifeq (1, ${BUILD_ARM32})
$(ENABLE_DOCKER_MANIFEST) docker manifest create --amend $(PREFIX)/$(2):$(LABEL_PREFIX) $(PREFIX)/$(1):$(LABEL_PREFIX)-$(ARM32V7_SUFFIX)
$(ENABLE_DOCKER_MANIFEST) docker manifest create --amend $(PREFIX)/$(2):$(LABEL_PREFIX) $(PREFIX)/$(2):$(LABEL_PREFIX)-$(ARM32V7_SUFFIX)
endif
ifeq (1, ${BUILD_ARM64})
$(ENABLE_DOCKER_MANIFEST) docker manifest create --amend $(PREFIX)/$(2):$(LABEL_PREFIX) $(PREFIX)/$(1):$(LABEL_PREFIX)-$(ARM64V8_SUFFIX)
$(ENABLE_DOCKER_MANIFEST) docker manifest create --amend $(PREFIX)/$(2):$(LABEL_PREFIX) $(PREFIX)/$(2):$(LABEL_PREFIX)-$(ARM64V8_SUFFIX)
endif

$(1)-docker-multi-arch-push:
Expand Down
9 changes: 3 additions & 6 deletions build/akri-rust-containers.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@

# Create set of targets for rust builds
define add_rust_targets
$(info compiling akri-$(1)) # logged when doing $(call ...)
$$(info evaluating akri-$(1)) # logged when doing $(eval $(call ...))

akri-$(1): akri-build akri-docker-$(1)
akri-docker-$(1): $(1)-build $(1)-docker-per-arch $(1)-docker-multi-arch-create $(1)-docker-multi-arch-push
$(1)-build: $(1)-build-amd64 $(1)-build-arm32 $(1)-build-arm64
Expand Down Expand Up @@ -37,13 +34,13 @@ define add_rust_targets

$(1)-docker-multi-arch-create:
ifeq (1, ${BUILD_AMD64})
$(ENABLE_DOCKER_MANIFEST) docker manifest create --amend $(PREFIX)/$(2):$(LABEL_PREFIX) $(PREFIX)/$(1):$(LABEL_PREFIX)-$(AMD64_SUFFIX)
$(ENABLE_DOCKER_MANIFEST) docker manifest create --amend $(PREFIX)/$(2):$(LABEL_PREFIX) $(PREFIX)/$(2):$(LABEL_PREFIX)-$(AMD64_SUFFIX)
endif
ifeq (1, ${BUILD_ARM32})
$(ENABLE_DOCKER_MANIFEST) docker manifest create --amend $(PREFIX)/$(2):$(LABEL_PREFIX) $(PREFIX)/$(1):$(LABEL_PREFIX)-$(ARM32V7_SUFFIX)
$(ENABLE_DOCKER_MANIFEST) docker manifest create --amend $(PREFIX)/$(2):$(LABEL_PREFIX) $(PREFIX)/$(2):$(LABEL_PREFIX)-$(ARM32V7_SUFFIX)
endif
ifeq (1, ${BUILD_ARM64})
$(ENABLE_DOCKER_MANIFEST) docker manifest create --amend $(PREFIX)/$(2):$(LABEL_PREFIX) $(PREFIX)/$(1):$(LABEL_PREFIX)-$(ARM64V8_SUFFIX)
$(ENABLE_DOCKER_MANIFEST) docker manifest create --amend $(PREFIX)/$(2):$(LABEL_PREFIX) $(PREFIX)/$(2):$(LABEL_PREFIX)-$(ARM64V8_SUFFIX)
endif

$(1)-docker-multi-arch-push:
Expand Down