github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-23 11:00:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #786 from justincormack/git-commit

Browse Source 
Add Moby git commit to image
This commit is contained in:
Justin Cormack 2016-11-24 05:14:46 -08:00 committed by GitHub
commit 55b2652bfa
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
alpine/.gitignore vendored
View File

@ -1,10 +1,8 @@
*.img *.img
*.img.gz
/mobylinux.img /mobylinux.img
/mobylinux.vhd /mobylinux.vhd
/mobylinux-bios.iso /mobylinux-bios.iso
/mobylinux-efi.iso /mobylinux-efi.iso
/mobylinux-boot.vhdx /mobylinux-boot.vhdx
/mobylinux.efi /mobylinux.efi
Dockerfile.armhf etc/moby-commit
etc/inittab

11
alpine/Makefile
View File

@ -2,9 +2,18 @@ all: initrd.img mobylinux-efi.iso mobylinux-bios.iso
ETCFILES=$(shell find etc) ETCFILES=$(shell find etc)
TAG=$(shell git rev-parse HEAD)
STATUS=$(shell git status -s)
ifeq ($(STATUS),)
DIRTY=
else
DIRTY=-dirty
endif
initrd.img: Dockerfile mkinitrd.sh init $(ETCFILES) initrd.img: Dockerfile mkinitrd.sh init $(ETCFILES)
$(MAKE) -C kernel $(MAKE) -C kernel
$(MAKE) -j -C packages $(MAKE) -j -C packages
printf $(TAG)$(DIRTY) > etc/moby-commit
BUILD=$$( tar cf - \ BUILD=$$( tar cf - \
Dockerfile etc usr init mkinitrd.sh \ Dockerfile etc usr init mkinitrd.sh \
-C kernel usr etc sbin lib -C .. \ -C kernel usr etc sbin lib -C .. \
@ -146,7 +155,7 @@ vhdartifact:
docker volume create --name vhdartifact || true docker volume create --name vhdartifact || true
clean: clean:
rm -f initrd.img mobylinux.vhd mobylinux.img mobylinux-bios.iso mobylinux-efi.iso mobylinux.efi rm -f initrd.img mobylinux.vhd mobylinux.img mobylinux-bios.iso mobylinux-efi.iso mobylinux.efi etc/moby-commit
docker images -q moby-azure:build | xargs docker rmi -f || true docker images -q moby-azure:build | xargs docker rmi -f || true
docker images -q moby-azure:raw2vhd | xargs docker rmi -f || true docker images -q moby-azure:raw2vhd | xargs docker rmi -f || true
docker volume rm vhdartifact || true docker volume rm vhdartifact || true