github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-20 09:39:08 +00:00
Code Issues Projects Releases Wiki Activity

makefile: Allow a bin/moby to be provided

Browse Source 
This is needed for CI to be able to run `moby run $platform` with a
known good version of moby. For example, the one generated when building
the `master`.

This protects CI from any nefarious changes to the `moby` tool and
allows `moby run` to be used safely to test PRs.

Signed-off-by: Dave Tucker <dt@docker.com>
This commit is contained in:
Dave Tucker 2017-04-06 15:14:25 +01:00
parent 9553bbf514
commit fddfd0b3ec
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -7,6 +7,7 @@ GIT_COMMIT=$(shell git rev-list -1 HEAD)
GO_COMPILE=mobylinux/go-compile:a2ff853b00d687f845d0f67189fa645a567c006e@sha256:09fff8a5c022fc9ead35b2779209c043196b09193c6e61d98603d402c0971f03 GO_COMPILE=mobylinux/go-compile:a2ff853b00d687f845d0f67189fa645a567c006e@sha256:09fff8a5c022fc9ead35b2779209c043196b09193c6e61d98603d402c0971f03
MOBY?=bin/moby
GOOS=$(shell uname -s | tr '[:upper:]' '[:lower:]') GOOS=$(shell uname -s | tr '[:upper:]' '[:lower:]')
GOARCH=amd64 GOARCH=amd64
ifneq ($(GOOS),linux) ifneq ($(GOOS),linux)
@ -27,7 +28,7 @@ bin/infrakit-instance-hyperkit: $(INFRAKIT_DEPS) | bin
tar cf - vendor -C src/cmd/infrakit-instance-hyperkit . | docker run --rm --net=none --log-driver=none -i $(CROSS) $(GO_COMPILE) --package github.com/docker/moby -o $@ | tar xf - tar cf - vendor -C src/cmd/infrakit-instance-hyperkit . | docker run --rm --net=none --log-driver=none -i $(CROSS) $(GO_COMPILE) --package github.com/docker/moby -o $@ | tar xf -
touch $@ touch $@
test-initrd.img: bin/moby test/test.yml test-initrd.img: $(MOBY) test/test.yml
bin/moby build test/test.yml bin/moby build test/test.yml
test-bzImage: test-initrd.img test-bzImage: test-initrd.img
@ -46,9 +47,9 @@ define check_test_log
endef endef
.PHONY: hyperkit-test .PHONY: hyperkit-test
hyperkit-test: bin/moby test-initrd.img test-bzImage test-cmdline hyperkit-test: $(MOBY) test-initrd.img test-bzImage test-cmdline
rm -f disk.img rm -f disk.img
script -q /dev/null bin/moby run test | tee test.log script -q /dev/null $(MOBY) run test | tee test.log
$(call check_test_log, test.log) $(call check_test_log, test.log)
.PHONY: test .PHONY: test