build: clean up docker build

1 files changed, 7 insertions, 12 deletions

diff --git a/Dockerfile b/Dockerfile
index fe246bb..d45f99c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,25 +1,20 @@
-# docker build -t vis .
-# docker run -it --name vis vis
-# docker cp . vis:/tmp/vis
-# ./configure CC='cc --static'
-# make
-# docker cp vis:/tmp/vis/vis .
-# make vis-single
-# docker cp vis:/tmp/vis/vis-single .
+# Run 'make docker' to build a statically linked vis executable!
 FROM i386/alpine:3.11
-ENV DIR /tmp/vis
-WORKDIR $DIR
-RUN apk update && apk add musl-dev fortify-headers gcc make libtermkey-dev \
+RUN apk update && apk upgrade && \
+	apk add musl-dev fortify-headers gcc make libtermkey-dev \
 	ncurses-dev ncurses-static lua5.3-dev lua5.3-lpeg lua-lpeg-dev \
 	acl-static 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 mkdir -p /build
+WORKDIR /build
 RUN wget https://github.com/martanne/libuntar/tarball/7c7247b442b021588f6deba78b60ef3b05ab1e0c -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
+	cp lib/libuntar.a /usr/local/lib && \
+	rm -rf /build/*libuntar*
 CMD ["/bin/sh"]