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

Merge pull request #851 from justincormack/push-image

Browse Source 
Push a copy of the Moby base image to mobylinux/mobylinux
This commit is contained in:
Justin Cormack 2016-12-07 13:58:49 -08:00 committed by GitHub
commit 7ef813e667
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -38,10 +38,14 @@ test: Dockerfile.test alpine/initrd.img alpine/kernel/x86_64/vmlinuz64
TAG=$(shell git rev-parse HEAD) TAG=$(shell git rev-parse HEAD)
STATUS=$(shell git status -s) STATUS=$(shell git status -s)
MOBYLINUX_TAG=alpine/mobylinux.tag
media: Dockerfile.media alpine/initrd.img alpine/kernel/x86_64/vmlinuz64 alpine/mobylinux-efi.iso media: Dockerfile.media alpine/initrd.img alpine/kernel/x86_64/vmlinuz64 alpine/mobylinux-efi.iso
ifeq ($(STATUS),) ifeq ($(STATUS),)
tar cf - $^ alpine/mobylinux.efi alpine/kernel/x86_64/vmlinux | docker build -f Dockerfile.media -t mobylinux/media:$(MEDIA_PREFIX)$(TAG) - tar cf - $^ alpine/mobylinux.efi alpine/kernel/x86_64/vmlinux | docker build -f Dockerfile.media -t mobylinux/media:$(MEDIA_PREFIX)$(TAG) -
docker push mobylinux/media:$(MEDIA_PREFIX)$(TAG) docker push mobylinux/media:$(MEDIA_PREFIX)$(TAG)
[ -f $(MOBYLINUX_TAG) ]
docker tag $(shell cat $(MOBYLINUX_TAG)) mobylinux/mobylinux:$(MEDIA_PREFIX)$(TAG)
docker push mobylinux/mobylinux:$(MEDIA_PREFIX)$(TAG)
else else
$(error "git not clean") $(error "git not clean")
endif endif

1
alpine/.gitignore vendored
View File

@ -1,4 +1,5 @@
*.img *.img
*.tag
/mobylinux.img /mobylinux.img
/mobylinux.vhd /mobylinux.vhd
/mobylinux-bios.iso /mobylinux-bios.iso

3
alpine/Makefile
View File

@ -43,6 +43,7 @@ moby-initrd.img: Dockerfile mkinitrd.sh init $(ETCFILES)
-C packages/azure etc -C ../.. \ -C packages/azure etc -C ../.. \
| \ | \
docker build -q - ) && [ -n "$$BUILD" ] && echo "Built $$BUILD" && \ docker build -q - ) && [ -n "$$BUILD" ] && echo "Built $$BUILD" && \
echo $$BUILD > mobylinux.tag && \
docker run --read-only --net=none --log-driver=none --rm --tmpfs /tmp --tmpfs /initrd $$BUILD > $@ docker run --read-only --net=none --log-driver=none --rm --tmpfs /tmp --tmpfs /initrd $$BUILD > $@
container-initrd.img: container-initrd.img:
@ -174,7 +175,7 @@ vhdartifact:
docker volume create --name vhdartifact || true docker volume create --name vhdartifact || true
clean: clean:
rm -f *.img *.vhd *.iso mobylinux.efi zeropad etc/moby-commit rm -f *.img *.vhd *.iso *.tag mobylinux.efi zeropad 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