From cf115e47f4eb6e876f2c9a2180684df04df24988 Mon Sep 17 00:00:00 2001 From: Tim Dysinger Date: Thu, 23 Apr 2015 21:18:27 -1000 Subject: [PATCH] we don't need to build an intermediate empty container image --- Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 92d69d9..9d13e5b 100644 --- a/Makefile +++ b/Makefile @@ -48,9 +48,7 @@ root/usr/lib/x86_64-linux-gnu/libgmp.so.10: | root/usr/lib/x86_64-linux-gnu @cp -L /usr/lib/x86_64-linux-gnu/libgmp.so.10 root/usr/lib/x86_64-linux-gnu/ image: | root/bin/sh root/lib/x86_64-linux-gnu/libm.so.6 root/lib/x86_64-linux-gnu/libz.so.1 root/lib/x86_64-linux-gnu/libdl.so.2 root/lib/x86_64-linux-gnu/libc.so.6 root/lib/x86_64-linux-gnu/libc.so.6 root/lib/x86_64-linux-gnu/libpthread.so.0 root/lib/x86_64-linux-gnu/librt.so.1 root/lib64/ld-linux-x86-64.so.2 root/usr/lib/x86_64-linux-gnu/gconv/UTF-16.so root/usr/lib/x86_64-linux-gnu/gconv/UTF-32.so root/usr/lib/x86_64-linux-gnu/gconv/UTF-7.so root/usr/lib/x86_64-linux-gnu/gconv/gconv-modules root/usr/lib/x86_64-linux-gnu/gconv/gconv-modules.cache root/usr/lib/x86_64-linux-gnu/libffi.so.6 root/usr/lib/x86_64-linux-gnu/libgmp.so.10 - @(docker images|grep -e '^empty' >/dev/null 2>&1) || \ - (tar cv --files-from >/dev/null 2>&1|docker import - empty) - @docker build -t haskell-scratch . + @tar -cC root .|docker import - haskell-scratch clean: @rm -rf root