1
0
mirror of https://github.com/rancher/os.git synced 2025-07-31 14:41:14 +00:00

Merge pull request #590 from ibuildthecloud/move-compose

Support kernels from local directories, but just remote URLs
This commit is contained in:
Darren Shepherd 2015-10-02 00:49:48 -07:00
commit d5964622eb
2 changed files with 3 additions and 2 deletions

2
.gitignore vendored
View File

@ -1,5 +1,5 @@
.DS_Store
/assets
/assets/ca.crt
/state
/bin
/build

View File

@ -26,7 +26,8 @@ $(DIST)/artifacts/vmlinuz: $(BUILD)/kernel/
$(BUILD)/kernel/:
mkdir -p $@ && curl -L "$(COMPILED_KERNEL_URL)" | tar -xzf - -C $@ --strip=0
mkdir -p $@
([ -e "$(COMPILED_KERNEL_URL)" ] && cat "$(COMPILED_KERNEL_URL)" || curl -L "$(COMPILED_KERNEL_URL)") | tar -xzf - -C $@
$(BUILD)/images.tar: bin/rancheros