fix: swap COPY to make sure our patch gets applied

neuvector · Dec 11, 2024 · 1043bdf · 1043bdf
1 parent 2638a15
commit 1043bdf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -38,6 +38,7 @@ jobs:
       with:
         push-to-public: true
         push-to-prime: false
+        make-target: push-image
         image: manager
         tag: ${{ env.TAG }}
         platforms: linux/amd64,linux/arm64
@@ -51,6 +52,7 @@ jobs:
       with:
         push-to-public: false
         push-to-prime: true
+        make-target: push-rancher-image
         image: neuvector-manager
         tag: ${{ env.TAG }}
         platforms: linux/amd64,linux/arm64

diff --git a/Makefile b/Makefile
@@ -93,6 +93,12 @@ build-image: buildx-machine ## build (and load) the container image targeting th
 	@echo "Built $(IMAGE)"
 
 push-image: buildx-machine
+	$(IMAGE_BUILDER) build -f package/Dockerfile \
+		--builder $(MACHINE) $(IMAGE_ARGS) $(IID_FILE_FLAG) $(BUILDX_ARGS) \
+		--build-arg VERSION=$(VERSION) --build-arg COMMIT=$(COMMIT) --platform=$(TARGET_PLATFORMS) -t "$(REPO)/manager:$(TAG)" --push .
+	@echo "Pushed $(IMAGE)"
+
+push-rancher-image: buildx-machine
 	$(IMAGE_BUILDER) build -f package/Dockerfile \
 		--builder $(MACHINE) $(IMAGE_ARGS) $(IID_FILE_FLAG) $(BUILDX_ARGS) \
 		--build-arg VERSION=$(VERSION) --build-arg COMMIT=$(COMMIT) --platform=$(TARGET_PLATFORMS) -t "$(REPO)/neuvector-manager:$(TAG)" --push .