Merge pull request #1887 from bassam/pr-fix-arm64

fix arm64 image builds
rook · Jul 18, 2018 · d537df8 · d537df8
2 parents 363e5ee + 1289bec
commit d537df8
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/images/Makefile b/images/Makefile
@@ -16,9 +16,6 @@ include image.mk
 
 PLATFORMS ?= linux_amd64 linux_arm64
 
-CEPH_BASE_IMAGE ?= ceph/daemon-base:v3.0.5-stable-3.0-luminous-centos-7-$(PLATFORM_ARCH)
-export CEPH_BASE_IMAGE
-
 # tini's version
 export TINI_VERSION = v0.16.1
 

diff --git a/images/ceph-toolbox/Makefile b/images/ceph-toolbox/Makefile
@@ -19,7 +19,8 @@ TOOLBOX_BASE_IMAGE = $(BUILD_REGISTRY)/ceph-toolbox-base-$(GOARCH)
 IMAGES = $(TOOLBOX_IMAGE) $(TOOLBOX_BASE_IMAGE)
 CACHE_IMAGES = $(TOOLBOX_BASE_IMAGE)
 
-BASEIMAGE = $(CEPH_BASE_IMAGE)
+CEPH_VERSION = $(shell cat ../ceph/ceph_version)
+BASEIMAGE = $(CEPH_VERSION)-$(PLATFORM_ARCH)
 
 TEMP := $(shell mktemp -d)
 

diff --git a/images/ceph/Makefile b/images/ceph/Makefile
@@ -20,7 +20,8 @@ include ../image.mk
 CEPH_IMAGE = $(BUILD_REGISTRY)/ceph-$(GOARCH)
 IMAGES = $(CEPH_IMAGE)
 
-BASEIMAGE = $(CEPH_BASE_IMAGE)
+CEPH_VERSION = $(shell cat ceph_version)
+BASEIMAGE = $(CEPH_VERSION)-$(PLATFORM_ARCH)
 
 TEMP := $(shell mktemp -d)
 

diff --git a/images/ceph/ceph_version b/images/ceph/ceph_version
@@ -0,0 +1 @@
+ceph/daemon-base:v3.0.5-stable-3.0-luminous-centos-7