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

Jump to bottom

fix(Makefile): Wrong image name for manifest #54

Merged
merged 8 commits into from
Mar 15, 2024
Merged

fix(Makefile): Wrong image name for manifest #54

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0fbb3f3
fix(Makefile): Wrong image name for manifest
anubhabMajumdar Mar 15, 2024
fdd6e7b
Remove arm64 operator image and manifest. Also, fix TAG in helm-instal*.
anubhabMajumdar Mar 15, 2024
d57ad30
Merge main
anubhabMajumdar Mar 15, 2024
c42b9e5
Fix OS and ARCH variables in container-docker
anubhabMajumdar Mar 15, 2024
50f83dc
Merge main
anubhabMajumdar Mar 15, 2024
5802491
Remove mount paths from daemonset
anubhabMajumdar Mar 15, 2024
53ae733
IMAGE_NAMESPACE line is fixed
anubhabMajumdar Mar 15, 2024
ceb3054
Merge branch 'main' into topic/anmajumdar/misc
anubhabMajumdar Mar 15, 2024
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
4 changes: 2 additions & 2 deletions .github/workflows/images.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
PLATFORM=${{ matrix.platform }}/${{ matrix.arch }}

retina-win-images:
name: Build Agent Images
name: Build Agent Windows Images
runs-on: ubuntu-latest

strategy:
Expand Down Expand Up @@ -85,7 +85,7 @@ jobs:
strategy:
matrix:
platform: ["linux"]
arch: ["amd64", "arm64"]
arch: ["amd64"]

steps:
- name: Checkout code
Expand Down
13 changes: 7 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,8 @@ retina-capture-workload: ## build the Retina capture workload
##@ Containers

IMAGE_REGISTRY ?= ghcr.io
IMAGE_NAMESPACE ?= $(shell git config --get remote.origin.url | sed -E 's/.*github\.com[\/:]([^\/]+)\/([^\/.]+).git/\1\/\2/')
# IMAGE_NAMESPACE ?= $(shell git config --get remote.origin.url |sed -E 's/.*github\.com[\/:]([^\/]+)\/([^\/.]+).git/\1\/\2/') # attempts to extract the upstream for image namespacing
IMAGE_NAMESPACE ?= microsoft/retina
anubhabMajumdar marked this conversation as resolved.
Show resolved Hide resolved

RETINA_BUILDER_IMAGE = $(IMAGE_NAMESPACE)/retina-builder
RETINA_TOOLS_IMAGE = $(IMAGE_NAMESPACE)/retina-tools
Expand Down Expand Up @@ -232,9 +233,9 @@ buildx:
fi;

container-docker: buildx # util target to build container images using docker buildx. do not invoke directly.
@os=$$(echo $(PLATFORM) | cut -d'/' -f1); \
@arch=$$(echo $(PLATFORM) | cut -d'/' -f2); \
@echo "Building for $$os/$$arch"; \
os=$$(echo $(PLATFORM) | cut -d'/' -f1); \
arch=$$(echo $(PLATFORM) | cut -d'/' -f2); \
echo "Building for $$os/$$arch"; \
docker buildx build \
$(ACTION) \
--platform $(PLATFORM) \
Expand Down Expand Up @@ -335,11 +336,11 @@ manifest-retina-image: ## create a multiplatform manifest for the retina image
$(eval FULL_IMAGE_NAME=$(IMAGE_REGISTRY)/$(RETINA_IMAGE):$(TAG))
$(eval FULL_INIT_IMAGE_NAME=$(IMAGE_REGISTRY)/$(RETINA_INIT_IMAGE):$(TAG))
docker buildx imagetools create -t $(FULL_IMAGE_NAME) $(foreach platform,linux/amd64 linux/arm64 windows-ltsc2019-amd64 windows-ltsc2022-amd64, $(FULL_IMAGE_NAME)-$(subst /,-,$(platform)))
docker buildx imagetools create -t $(FULL_INIT_IMAGE_NAME) $(foreach platform,linux/amd64 linux/arm64, $(FULL_IMAGE_NAME)-$(subst /,-,$(platform)))
docker buildx imagetools create -t $(FULL_INIT_IMAGE_NAME) $(foreach platform,linux/amd64 linux/arm64, $(FULL_INIT_IMAGE_NAME)-$(subst /,-,$(platform)))

manifest-operator-image: ## create a multiplatform manifest for the operator image
$(eval FULL_IMAGE_NAME=$(IMAGE_REGISTRY)/$(RETINA_OPERATOR_IMAGE):$(TAG))
docker buildx imagetools create -t $(FULL_IMAGE_NAME) $(foreach platform,linux/amd64 linux/arm64, $(FULL_IMAGE_NAME)-$(subst /,-,$(platform)))
docker buildx imagetools create -t $(FULL_IMAGE_NAME) $(foreach platform,linux/amd64, $(FULL_IMAGE_NAME)-$(subst /,-,$(platform)))

manifest-kubectl-retina-image: ## create a multiplatform manifest for the kubectl-retina image
$(eval FULL_IMAGE_NAME=$(IMAGE_REGISTRY)/$(KUBECTL_RETINA_IMAGE):$(TAG))
Expand Down
Loading