From baf35e12d64bdf704e7bd3c16707f1b94f1c8a8d Mon Sep 17 00:00:00 2001 From: Manuel Buil Date: Fri, 22 Sep 2023 16:03:10 +0200 Subject: [PATCH] Remove push-manifest from drone and Makefile Signed-off-by: Manuel Buil --- .drone.yml | 4 ++-- Makefile | 8 -------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/.drone.yml b/.drone.yml index 2d7b053..1412416 100644 --- a/.drone.yml +++ b/.drone.yml @@ -21,7 +21,7 @@ steps: image: rancher/hardened-build-base:v1.20.7b3 commands: - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD - - make DRONE_TAG=${DRONE_TAG} image-push image-manifest + - make DRONE_TAG=${DRONE_TAG} image-push environment: DOCKER_PASSWORD: from_secret: docker_password @@ -70,7 +70,7 @@ steps: image: rancher/hardened-build-base:v1.20.4b11 commands: - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD - - make DRONE_TAG=${DRONE_TAG} image-push image-manifest + - make DRONE_TAG=${DRONE_TAG} image-push environment: DOCKER_PASSWORD: from_secret: docker_password diff --git a/Makefile b/Makefile index acdaad5..a2511dc 100644 --- a/Makefile +++ b/Makefile @@ -36,14 +36,6 @@ image-build: image-push: docker push $(ORG)/hardened-sriov-cni:$(TAG)-$(ARCH) -.PHONY: image-manifest -image-manifest: - DOCKER_CLI_EXPERIMENTAL=enabled docker manifest create --amend \ - $(ORG)/hardened-sriov-cni:$(TAG) \ - $(ORG)/hardened-sriov-cni:$(TAG)-$(ARCH) - DOCKER_CLI_EXPERIMENTAL=enabled docker manifest push \ - $(ORG)/hardened-sriov-cni:$(TAG) - .PHONY: image-scan image-scan: trivy image --severity $(SEVERITIES) --no-progress --ignore-unfixed $(ORG)/hardened-sriov-cni:$(TAG)