github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-22 18:41:37 +00:00
Code Issues Projects Releases Wiki Activity

Fix build failure in toybox build with one argument

Browse Source 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack 2016-11-28 11:58:57 +00:00
parent b2cae0e086
commit 33888458e5
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile.media
View File

@ -1,4 +1,4 @@
FROM mobylinux/toybox-media:d476c196534464ca0dd93f8c765002c13d880a1a
FROM mobylinux/toybox-media:e22a41942621b5655bd952b7715d695eaed32647
ADD \
alpine/initrd.img \

2
alpine/base/alpine-build-toybox/build.sh
View File

@ -2,7 +2,7 @@
FILES=$@
make $FILES > /dev/null
[ $# -eq 1 ] && FILES=toybox
[ $# -eq 0 ] && FILES=toybox
# TODO symlinks if just use toybox
mkdir -p /out/bin
mv $FILES /out/bin

4
alpine/base/toybox-media/Makefile
View File

@ -1,12 +1,12 @@
.PHONY: tag push
BASE=mobylinux/alpine-build-toybox:21d65671879b26ba76d606da625d821455035253
IMAGE=toybox-media
default: push
hash:
docker run mobylinux/alpine-build-toybox:9d6a5b75d2c5ba1686f23c333b59cbb56bfc4ccf \
ls tar sh find sha1sum | \
docker run $(BASE) ls tar sh find sha1sum | \
docker build -q -t $(IMAGE):build -
docker run $(IMAGE):build tar cf - bin | docker run -i $(IMAGE):build sha1sum -b - > hash