From 8b218dfbe78ee6438202bf90b25b2a842e1da9b6 Mon Sep 17 00:00:00 2001 From: Blaine Gardner Date: Fri, 20 Jul 2018 11:59:07 -0600 Subject: [PATCH] make: Remove unused `IMAGES` from image Makefiles Many of the `rook/images//` directory Makefiles defined a variable called `IMAGES`, which was unused and causing some developer confusion with the feature adding the ability to specify which backend images to build. Remove these unused instances. Signed-off-by: Blaine Gardner --- images/ceph-toolbox/Makefile | 1 - images/ceph/Makefile | 1 - images/cockroachdb/Makefile | 1 - images/cross/Makefile | 3 +-- 4 files changed, 1 insertion(+), 5 deletions(-) diff --git a/images/ceph-toolbox/Makefile b/images/ceph-toolbox/Makefile index 513130f76..b3e914273 100644 --- a/images/ceph-toolbox/Makefile +++ b/images/ceph-toolbox/Makefile @@ -16,7 +16,6 @@ include ../image.mk TOOLBOX_IMAGE = $(BUILD_REGISTRY)/ceph-toolbox-$(GOARCH) TOOLBOX_BASE_IMAGE = $(BUILD_REGISTRY)/ceph-toolbox-base-$(GOARCH) -IMAGES = $(TOOLBOX_IMAGE) $(TOOLBOX_BASE_IMAGE) CACHE_IMAGES = $(TOOLBOX_BASE_IMAGE) CEPH_VERSION = $(shell cat ../ceph/ceph_version) diff --git a/images/ceph/Makefile b/images/ceph/Makefile index 9b3ac4d20..f883a6f17 100755 --- a/images/ceph/Makefile +++ b/images/ceph/Makefile @@ -18,7 +18,6 @@ include ../image.mk # Image Build Options CEPH_IMAGE = $(BUILD_REGISTRY)/ceph-$(GOARCH) -IMAGES = $(CEPH_IMAGE) CEPH_VERSION = $(shell cat ceph_version) BASEIMAGE = $(CEPH_VERSION)-$(PLATFORM_ARCH) diff --git a/images/cockroachdb/Makefile b/images/cockroachdb/Makefile index 77e814504..67e7edbc9 100755 --- a/images/cockroachdb/Makefile +++ b/images/cockroachdb/Makefile @@ -18,7 +18,6 @@ include ../image.mk # Image Build Options COCKROACHDB_IMAGE = $(BUILD_REGISTRY)/cockroachdb-$(GOARCH) -IMAGES = $(COCKROACHDB_IMAGE) TEMP := $(shell mktemp -d) diff --git a/images/cross/Makefile b/images/cross/Makefile index 2b41696c4..18aa137d5 100644 --- a/images/cross/Makefile +++ b/images/cross/Makefile @@ -15,8 +15,7 @@ include ../image.mk IMAGE = $(BUILD_REGISTRY)/cross-$(GOARCH) -IMAGES := $(IMAGE) -CACHE_IMAGES = $(IMAGES) +CACHE_IMAGES = $(IMAGE) TEMP := $(shell mktemp -d)