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

Use docker and cat not compose and volumes for arm

Browse Source 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack 2016-09-07 00:22:21 +01:00
parent 5c38729d26
commit 0337f80297
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
alpine/Makefile
View File

@ -43,8 +43,8 @@ initrd-arm.img: Dockerfile.armhf
rm -f initrd-arm.img rm -f initrd-arm.img
$(MAKE) -C packages arm $(MAKE) -C packages arm
$(MAKE) -C kernel arm $(MAKE) -C kernel arm
docker-compose build arm docker build -t moby-arm:build -f Dockerfile.armhf .
docker-compose run --rm -T arm /bin/mkinitrd.sh > $@ docker run --net=none --rm moby-arm:build /bin/mkinitrd.sh > $@
common: initrd.img common: initrd.img
$(MAKE) -C kernel $(MAKE) -C kernel
@ -67,7 +67,7 @@ clean:
rm -f mobylinux-bios.iso mobylinux-efi.iso mobylinux.efi rm -f mobylinux-bios.iso mobylinux-efi.iso mobylinux.efi
docker images -q moby-efi:build | xargs docker rmi -f || true docker images -q moby-efi:build | xargs docker rmi -f || true
docker images -q moby-bios:build | xargs docker rmi -f || true docker images -q moby-bios:build | xargs docker rmi -f || true
docker images -q alpine_arm:latest | xargs docker rmi -f || true docker images -q moby-arm:build | xargs docker rmi -f || true
docker images -q alpine_ami:latest | xargs docker rmi -f || true docker images -q alpine_ami:latest | xargs docker rmi -f || true
docker images -q alpine_azure:latest | xargs docker rmi -f || true docker images -q alpine_azure:latest | xargs docker rmi -f || true
$(MAKE) -C packages clean $(MAKE) -C packages clean

5
alpine/docker-compose.yml
View File

@ -1,10 +1,5 @@
version: '2' version: '2'
services: services:
arm:
build:
context: .
dockerfile: Dockerfile.armhf
network_mode: bridge
azure: azure:
privileged: true privileged: true
build: build: