build: port self-contained executable to libuntar

It is currently not packaged by Alpine which is why we are building it
during docker image creation.

Also cleanup vis-single.

1 files changed, 10 insertions, 1 deletions

diff --git a/Dockerfile b/Dockerfile
index 35f3df2..e6d3d3b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,8 +9,17 @@
 FROM i386/alpine:3.6
 ENV DIR /tmp/vis
 WORKDIR $DIR
-RUN apk update && apk add musl-dev fortify-headers gcc make libtermkey-dev ncurses-dev ncurses-static lua5.3-dev lua5.3-lpeg lua-lpeg-dev acl-dev libtar-dev xz-dev tar xz
+RUN apk update && apk add musl-dev fortify-headers gcc make libtermkey-dev \
+	ncurses-dev ncurses-static lua5.3-dev lua5.3-lpeg lua-lpeg-dev \
+	acl-dev xz-dev tar xz wget ca-certificates
 RUN sed -i 's/Libs: /Libs: -L${INSTALL_CMOD} /' /usr/lib/pkgconfig/lua5.3.pc
 RUN mv /usr/lib/lua/5.3/lpeg.a /usr/lib/lua/5.3/liblpeg.a
 RUN sed -i 's/-ltermkey/-ltermkey -lunibilium/' /usr/lib/pkgconfig/termkey.pc
+# TODO contribute a proper libuntar package to Alpine
+RUN wget https://github.com/martanne/libuntar/tarball/3f5e915ad8e6c5faa8dc6b34532e32b519f278f3 -O libuntar.tar.gz && \
+	tar xf libuntar.tar.gz && cd *-libuntar-* && \
+	make && \
+	mkdir -p /usr/local/include && \
+	cp lib/libuntar.h /usr/local/include && \
+	cp lib/libuntar.a /usr/local/lib
 CMD ["/bin/sh"]