From 68aba4d369679b546eea69a696e3711d6333fe5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Andr=C3=A9=20Tanner?= Date: Wed, 29 Jan 2020 22:55:20 +0100 Subject: build: cleanup docker package installation --- Dockerfile | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index d45f99c..7a24c80 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,23 @@ # Run 'make docker' to build a statically linked vis executable! FROM i386/alpine:3.11 -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 apk update && apk add --upgrade --no-cache \ + acl-dev \ + acl-static \ + ca-certificates \ + fortify-headers \ + gcc \ + libtermkey-dev \ + lua5.3-dev \ + lua5.3-lpeg \ + lua-lpeg-dev \ + make \ + musl-dev \ + ncurses-dev \ + ncurses-static \ + tar \ + wget \ + xz \ + xz-dev 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 -- cgit v1.2.3