Merge pull request #117879 from kkkkun/fix-make-etcd-image-failed
Fix make etcd image failed
This commit is contained in:
		@@ -180,9 +180,9 @@ else
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
	# Add this ENV variable in order to workaround an unsupported arch blocker
 | 
						# Add this ENV variable in order to workaround an unsupported arch blocker
 | 
				
			||||||
	# On arm (which is 32-bit), it can't handle >1GB data in-memory
 | 
						# On arm (which is 32-bit), it can't handle >1GB data in-memory
 | 
				
			||||||
	ifeq ($(ARCH),arm)
 | 
					        ifeq ($(ARCH),arm)
 | 
				
			||||||
		cd $(TEMP_DIR) && echo "ENV ETCD_UNSUPPORTED_ARCH=$(ARCH)" >> $(DOCKERFILE)
 | 
							cd $(TEMP_DIR) && echo "ENV ETCD_UNSUPPORTED_ARCH=$(ARCH)" >> $(DOCKERFILE)
 | 
				
			||||||
	endif
 | 
					        endif
 | 
				
			||||||
endif
 | 
					endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	docker run --rm --privileged multiarch/qemu-user-static:$(QEMUVERSION) --reset -p yes
 | 
						docker run --rm --privileged multiarch/qemu-user-static:$(QEMUVERSION) --reset -p yes
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user