From 99a8a959b7bfad69eb28a9828150a7f9173aa64f Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Thu, 24 Nov 2016 13:09:58 +0000 Subject: [PATCH] Add Moby git commit to image Fix #345 Signed-off-by: Justin Cormack --- alpine/.gitignore | 4 +--- alpine/Makefile | 11 ++++++++++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/alpine/.gitignore b/alpine/.gitignore index 629b3546c..b052907c4 100644 --- a/alpine/.gitignore +++ b/alpine/.gitignore @@ -1,10 +1,8 @@ *.img -*.img.gz /mobylinux.img /mobylinux.vhd /mobylinux-bios.iso /mobylinux-efi.iso /mobylinux-boot.vhdx /mobylinux.efi -Dockerfile.armhf -etc/inittab +etc/moby-commit diff --git a/alpine/Makefile b/alpine/Makefile index bb6440d5a..0d58db868 100644 --- a/alpine/Makefile +++ b/alpine/Makefile @@ -2,9 +2,18 @@ all: initrd.img mobylinux-efi.iso mobylinux-bios.iso 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) $(MAKE) -C kernel $(MAKE) -j -C packages + printf $(TAG)$(DIRTY) > etc/moby-commit BUILD=$$( tar cf - \ Dockerfile etc usr init mkinitrd.sh \ -C kernel usr etc sbin lib -C .. \ @@ -146,7 +155,7 @@ vhdartifact: docker volume create --name vhdartifact || true 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:raw2vhd | xargs docker rmi -f || true docker volume rm vhdartifact || true