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 #871 from justincormack/rename-bios

Browse Source 
Rename the bios build image to mkimage-iso-bios
This commit is contained in:
Justin Cormack 2016-12-12 16:03:27 -08:00 committed by GitHub
commit 73c1134f99
5 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
alpine/Makefile
View File

@ -10,8 +10,8 @@ else
DIRTY=-dirty
endif
# Tag: e6cb3f313db7098a1cd21051e678b01931a037a0
ALPINE_BIOS_DIGEST=b06567c9d00fd4d1193e58fa8242a85121482eb2fb20ac4442388b7eb9cdceb3
# Tag: 22b043cb43f6bc3bc4e1f1ecf9d64932f9325642
BIOS_IMAGE=mobylinux/mkimage-iso-bios@sha256:7e28f7745fd62284142dce59a137c3331f7673efe8b3f19ee5c65e4cc27ff18c
# Tag: 95d4fef1a9555b640b4f94a4a3968533714059fe
PAD4_IMAGE=mobylinux/pad4@sha256:a26e02f16bdafa241a55e05fa09b9bb260e69a3a8c90418bb40b4ae936437d17
@ -76,7 +76,7 @@ mobylinux-efi.iso: Dockerfile.efi initrd.img kernel/x86_64/vmlinuz64
mobylinux-bios.iso: initrd.img kernel/x86_64/vmlinuz64
tar cf - initrd.img -C kernel/x86_64 vmlinuz64 | \
docker run --rm --net=none --log-driver=none -i mobylinux/alpine-bios@sha256:$(ALPINE_BIOS_DIGEST) >$@
docker run --rm --net=none --log-driver=none -i $(BIOS_IMAGE) >$@
common: initrd.img
$(MAKE) -C kernel

0
alpine/base/alpine-bios/Dockerfile → alpine/base/mkimage-iso-bios/Dockerfile
View File

2
alpine/base/alpine-bios/Makefile → alpine/base/mkimage-iso-bios/Makefile
View File

@ -1,7 +1,7 @@
.PHONY: tag push
BASE=alpine:3.4
IMAGE=alpine-bios
IMAGE=mkimage-iso-bios
default: push

0
alpine/base/alpine-bios/isolinux.cfg → alpine/base/mkimage-iso-bios/isolinux.cfg
View File

0
alpine/base/alpine-bios/make-iso → alpine/base/mkimage-iso-bios/make-iso
View File