From 3a2a2d2021b8fa57dccedb3f8e5bc6da33cf2666 Mon Sep 17 00:00:00 2001 From: Jared Watts Date: Fri, 18 May 2018 14:25:39 -0700 Subject: [PATCH] build: rook/ceph image build Signed-off-by: Jared Watts --- Jenkinsfile | 2 +- build/codegen/codegen.sh | 2 +- build/makelib/helm.mk | 2 +- build/release/Makefile | 2 +- build/release/README.md | 2 +- images/Makefile | 8 +++---- images/{rook => ceph}/Dockerfile | 0 images/{rook => ceph}/Dockerfile.base | 0 images/{rook => ceph}/Makefile | 34 +++++++++++++-------------- images/toolbox/Makefile | 4 ++-- 10 files changed, 28 insertions(+), 28 deletions(-) rename images/{rook => ceph}/Dockerfile (100%) rename images/{rook => ceph}/Dockerfile.base (100%) rename images/{rook => ceph}/Makefile (65%) diff --git a/Jenkinsfile b/Jenkinsfile index eb835bb5b..74c1980ba 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -64,7 +64,7 @@ pipeline { } steps{ sh 'cat _output/version | xargs tests/scripts/makeTestImages.sh save amd64' - stash name: 'repo-amd64',includes: 'rook-amd64.tar,build/common.sh,_output/tests/linux_amd64/,_output/charts/,tests/scripts/' + stash name: 'repo-amd64',includes: 'ceph-amd64.tar,build/common.sh,_output/tests/linux_amd64/,_output/charts/,tests/scripts/' script{ def data = [ "aws_1.7.x": "v1.7.11", diff --git a/build/codegen/codegen.sh b/build/codegen/codegen.sh index 12fb9055c..874108f63 100755 --- a/build/codegen/codegen.sh +++ b/build/codegen/codegen.sh @@ -20,7 +20,7 @@ cd ${scriptdir}/../../vendor/k8s.io/code-generator && ./generate-groups.sh \ all \ github.com/rook/rook/pkg/client \ github.com/rook/rook/pkg/apis \ - "rook.io:v1alpha1" + "rook.io:v1alpha1,v1alpha2 ceph.rook.io:v1alpha1" # this seems busted in the release-1.8 branch # --go-header-file ${SCRIPT_ROOT}/build/codegen/header.txt diff --git a/build/makelib/helm.mk b/build/makelib/helm.mk index e0e270665..607089f53 100644 --- a/build/makelib/helm.mk +++ b/build/makelib/helm.mk @@ -13,7 +13,7 @@ # limitations under the License. # the helm charts to build -HELM_CHARTS ?= rook +HELM_CHARTS ?= rook-ceph HELM_BASE_URL ?= https://charts.rook.io HELM_S3_BUCKET ?= rook.charts HELM_CHARTS_DIR ?= $(ROOT_DIR)/cluster/charts diff --git a/build/release/Makefile b/build/release/Makefile index fbf1cf2a1..f0ea0a857 100644 --- a/build/release/Makefile +++ b/build/release/Makefile @@ -58,7 +58,7 @@ endif DOCKER_REGISTRY ?= rook QUAY_REGISTRY ?= quay.io/rook REGISTRIES ?= $(DOCKER_REGISTRY) $(QUAY_REGISTRY) -IMAGES ?= rook toolbox +IMAGES ?= ceph toolbox IMAGE_ARCHS := $(subst linux_,,$(filter linux_%,$(PLATFORMS))) IMAGE_PLATFORMS := $(subst _,/,$(subst $(SPACE),$(COMMA),$(filter linux_%,$(PLATFORMS)))) diff --git a/build/release/README.md b/build/release/README.md index ef8a85e17..868380096 100644 --- a/build/release/README.md +++ b/build/release/README.md @@ -64,6 +64,6 @@ Binaries go to an S3 bucket `rook-release` (and https://release.rook.io) and hav Containers go to docker hub and quay.io where we have the following repos: ``` -rook/rook +rook/ceph rook/toolbox ``` diff --git a/images/Makefile b/images/Makefile index e3a9dfdb0..e5b28e5cb 100644 --- a/images/Makefile +++ b/images/Makefile @@ -30,13 +30,13 @@ cross: cross.linux_amd64 cross.%: base.linux_amd64 @$(MAKE) -C cross PLATFORM=$* -rook.%: base.% - @$(MAKE) -C rook PLATFORM=$* +ceph.%: base.% + @$(MAKE) -C ceph PLATFORM=$* -toolbox.%: rook.% +toolbox.%: ceph.% @$(MAKE) -C toolbox PLATFORM=$* -do.build.images.%: rook.% toolbox.% ; +do.build.images.%: ceph.% toolbox.% ; do.build: do.build.images.$(PLATFORM) ; build.all: $(foreach p,$(PLATFORMS), do.build.images.$(p)) ; diff --git a/images/rook/Dockerfile b/images/ceph/Dockerfile similarity index 100% rename from images/rook/Dockerfile rename to images/ceph/Dockerfile diff --git a/images/rook/Dockerfile.base b/images/ceph/Dockerfile.base similarity index 100% rename from images/rook/Dockerfile.base rename to images/ceph/Dockerfile.base diff --git a/images/rook/Makefile b/images/ceph/Makefile similarity index 65% rename from images/rook/Makefile rename to images/ceph/Makefile index cf1de2c98..c8f6183b8 100755 --- a/images/rook/Makefile +++ b/images/ceph/Makefile @@ -17,10 +17,10 @@ include ../image.mk # ==================================================================================== # Image Build Options -ROOK_IMAGE = $(BUILD_REGISTRY)/rook-$(GOARCH) -ROOK_BASE_IMAGE = $(BUILD_REGISTRY)/rook-base-$(GOARCH) -IMAGES = $(ROOK_IMAGE) $(ROOK_BASE_IMAGE) -CACHE_IMAGES = $(ROOK_BASE_IMAGE) +CEPH_IMAGE = $(BUILD_REGISTRY)/ceph-$(GOARCH) +CEPH_BASE_IMAGE = $(BUILD_REGISTRY)/ceph-base-$(GOARCH) +IMAGES = $(CEPH_IMAGE) $(CEPH_BASE_IMAGE) +CACHE_IMAGES = $(CEPH_BASE_IMAGE) BASEIMAGE = $(BUILD_REGISTRY)/base-$(GOARCH) @@ -29,29 +29,29 @@ TEMP := $(shell mktemp -d) # ==================================================================================== # Build Rook -rook-base-image: - @echo === docker build $(ROOK_BASE_IMAGE) +ceph-base-image: + @echo === docker build $(CEPH_BASE_IMAGE) @cp Dockerfile.base $(TEMP)/Dockerfile @cd $(TEMP) && $(SED_CMD) 's|BASEIMAGE|$(BASEIMAGE)|g' Dockerfile - @docker build $(BUILD_ARGS) -t $(ROOK_BASE_IMAGE) $(TEMP) + @docker build $(BUILD_ARGS) -t $(CEPH_BASE_IMAGE) $(TEMP) # since this is a leaf image we avoid leaving around a lot of dangling images -# by removing the last build of the final rook image -OLD_IMAGE_ID := $(shell docker images -q $(ROOK_IMAGE)) -CURRENT_IMAGE_ID := $$(docker images -q $(ROOK_IMAGE)) -IMAGE_FILENAME := $(IMAGE_OUTPUT_DIR)/rook.tar.gz +# by removing the last build of the final ceph image +OLD_IMAGE_ID := $(shell docker images -q $(CEPH_IMAGE)) +CURRENT_IMAGE_ID := $$(docker images -q $(CEPH_IMAGE)) +IMAGE_FILENAME := $(IMAGE_OUTPUT_DIR)/ceph.tar.gz -do.build: rook-base-image - @echo === docker build $(ROOK_IMAGE) +do.build: ceph-base-image + @echo === docker build $(CEPH_IMAGE) @cp Dockerfile $(TEMP) @cp $(OUTPUT_DIR)/bin/linux_$(GOARCH)/rook $(TEMP) @cp $(OUTPUT_DIR)/bin/linux_$(GOARCH)/rookflex $(TEMP) - @cd $(TEMP) && $(SED_CMD) 's|BASEIMAGE|$(ROOK_BASE_IMAGE)|g' Dockerfile - @docker build $(BUILD_ARGS) -t $(ROOK_IMAGE) $(TEMP) + @cd $(TEMP) && $(SED_CMD) 's|BASEIMAGE|$(CEPH_BASE_IMAGE)|g' Dockerfile + @docker build $(BUILD_ARGS) -t $(CEPH_IMAGE) $(TEMP) @[ "$(OLD_IMAGE_ID)" != "$(CURRENT_IMAGE_ID)" ] && [ -n "$(OLD_IMAGE_ID)" ] && docker rmi $(OLD_IMAGE_ID) || true @if [ ! -e "$(IMAGE_FILENAME)" ] || [ "$(OLD_IMAGE_ID)" != "$(CURRENT_IMAGE_ID)" ] || [ -n "$(OLD_IMAGE_ID)" ]; then \ - echo === saving image $(ROOK_IMAGE); \ + echo === saving image $(CEPH_IMAGE); \ mkdir -p $(IMAGE_OUTPUT_DIR); \ - docker save $(ROOK_IMAGE) | gzip -c > $(IMAGE_FILENAME); \ + docker save $(CEPH_IMAGE) | gzip -c > $(IMAGE_FILENAME); \ fi @rm -fr $(TEMP) \ No newline at end of file diff --git a/images/toolbox/Makefile b/images/toolbox/Makefile index fc878267b..05accd948 100644 --- a/images/toolbox/Makefile +++ b/images/toolbox/Makefile @@ -19,7 +19,7 @@ TOOLBOX_BASE_IMAGE = $(BUILD_REGISTRY)/toolbox-base-$(GOARCH) IMAGES = $(TOOLBOX_IMAGE) $(TOOLBOX_BASE_IMAGE) CACHE_IMAGES = $(TOOLBOX_BASE_IMAGE) -BASEIMAGE = $(BUILD_REGISTRY)/rook-base-$(GOARCH) +BASEIMAGE = $(BUILD_REGISTRY)/ceph-base-$(GOARCH) TEMP := $(shell mktemp -d) @@ -30,7 +30,7 @@ toolbox-base-image: @docker build $(BUILD_ARGS) -t $(TOOLBOX_BASE_IMAGE) $(TEMP) # since this is a leaf image we avoid leaving around a lot of dangling images -# by removing the last build of the final rook image +# by removing the last build of the final toolbox image OLD_IMAGE_ID := $(shell docker images -q $(TOOLBOX_IMAGE)) CURRENT_IMAGE_ID := $$(docker images -q $(TOOLBOX_IMAGE)) IMAGE_FILENAME := $(IMAGE_OUTPUT_DIR)/toolbox.tar.gz