From 0337f80297416f736383440c84a25a8fcd936a6a Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Wed, 7 Sep 2016 00:22:21 +0100 Subject: [PATCH] Use docker and cat not compose and volumes for arm Signed-off-by: Justin Cormack --- alpine/Makefile | 6 +++--- alpine/docker-compose.yml | 5 ----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/alpine/Makefile b/alpine/Makefile index f08608cc0..0b9d3715d 100644 --- a/alpine/Makefile +++ b/alpine/Makefile @@ -43,8 +43,8 @@ initrd-arm.img: Dockerfile.armhf rm -f initrd-arm.img $(MAKE) -C packages arm $(MAKE) -C kernel arm - docker-compose build arm - docker-compose run --rm -T arm /bin/mkinitrd.sh > $@ + docker build -t moby-arm:build -f Dockerfile.armhf . + docker run --net=none --rm moby-arm:build /bin/mkinitrd.sh > $@ common: initrd.img $(MAKE) -C kernel @@ -67,7 +67,7 @@ clean: 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-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_azure:latest | xargs docker rmi -f || true $(MAKE) -C packages clean diff --git a/alpine/docker-compose.yml b/alpine/docker-compose.yml index 69d90058b..355380911 100644 --- a/alpine/docker-compose.yml +++ b/alpine/docker-compose.yml @@ -1,10 +1,5 @@ version: '2' services: - arm: - build: - context: . - dockerfile: Dockerfile.armhf - network_mode: bridge azure: privileged: true build: