Skip to content
Snippets Groups Projects
Unverified Commit 92e2c90a authored by Mohamed S. Mahmoud's avatar Mohamed S. Mahmoud Committed by GitHub
Browse files

fix makefile (#120)

parent cc0ca5aa
Branches
Tags
No related merge requests found
...@@ -40,7 +40,7 @@ jobs: ...@@ -40,7 +40,7 @@ jobs:
- name: build and push images - name: build and push images
run: IMAGE_ORG=${{ env.ORG }} IMAGE=${{ env.REGISTRY }}/${{ env.IMAGE }}:${{ env.short_sha }} make images run: IMAGE_ORG=${{ env.ORG }} IMAGE=${{ env.REGISTRY }}/${{ env.IMAGE }}:${{ env.short_sha }} make images
- name: build and push manifest - name: build and push manifest
run: IMAGE_ORG=${{ env.ORG }} VERSION=${{ env.VERSION }} make ci-manifest run: IMAGE_ORG=${{ env.ORG }} IMAGE=${{ env.REGISTRY }}/${{ env.IMAGE }}:${{ env.VERSION }} make ci-manifest
- uses: actions/github-script@v6 - uses: actions/github-script@v6
with: with:
github-token: ${{secrets.GITHUB_TOKEN}} github-token: ${{secrets.GITHUB_TOKEN}}
......
...@@ -32,7 +32,7 @@ IMAGE_SHA = $(IMAGE_TAG_BASE):$(BUILD_SHA) ...@@ -32,7 +32,7 @@ IMAGE_SHA = $(IMAGE_TAG_BASE):$(BUILD_SHA)
# Image building tool (docker / podman) # Image building tool (docker / podman)
OCI_BIN_PATH := $(shell which podman || which docker) OCI_BIN_PATH := $(shell which podman || which docker)
OCI_BIN ?= $(shell v='$(OCI_BIN_PATH)'; echo "$${v##*/}") OCI_BIN ?= $(shell basename ${OCI_BIN_PATH})
LOCAL_GENERATOR_IMAGE ?= ebpf-generator:latest LOCAL_GENERATOR_IMAGE ?= ebpf-generator:latest
CILIUM_EBPF_VERSION := v0.10.0 CILIUM_EBPF_VERSION := v0.10.0
...@@ -58,6 +58,12 @@ define push_target ...@@ -58,6 +58,12 @@ define push_target
DOCKER_BUILDKIT=1 $(OCI_BIN) push ${IMAGE}-$(1); DOCKER_BUILDKIT=1 $(OCI_BIN) push ${IMAGE}-$(1);
endef endef
# manifest create a single arch target provided as argument
define manifest_create_target
echo 'manifest create for arch $(1)'; \
DOCKER_BUILDKIT=1 $(OCI_BIN) manifest add ${IMAGE} ${IMAGE}-$(target);
endef
##@ General ##@ General
# The help target prints out all targets with their descriptions organized # The help target prints out all targets with their descriptions organized
...@@ -169,8 +175,9 @@ image-push: ## Push MULTIARCH_TARGETS images ...@@ -169,8 +175,9 @@ image-push: ## Push MULTIARCH_TARGETS images
.PHONY: manifest-build .PHONY: manifest-build
manifest-build: ## Build MULTIARCH_TARGETS manifest manifest-build: ## Build MULTIARCH_TARGETS manifest
@echo 'building manifest $(IMAGE)' trap 'exit' INT; \
DOCKER_BUILDKIT=1 $(OCI_BIN) manifest create ${IMAGE} $(foreach target,$(MULTIARCH_TARGETS),--amend ${IMAGE}-$(target)); DOCKER_BUILDKIT=1 $(OCI_BIN) manifest create ${IMAGE}
$(foreach target,$(MULTIARCH_TARGETS),$(call manifest_create_target,$(target)))
.PHONY: manifest-push .PHONY: manifest-push
manifest-push: ## Push MULTIARCH_TARGETS manifest manifest-push: ## Push MULTIARCH_TARGETS manifest
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment