diff options
| author | Karl Schultheisz <kdsch@protonmail.com> | 2020-01-21 21:27:11 -0500 |
|---|---|---|
| committer | Karl Schultheisz <kdsch@protonmail.com> | 2020-01-21 21:27:11 -0500 |
| commit | 2d6150426fe825cd7b179c5c3ed648ae607be122 (patch) | |
| tree | 72d0d8be0c235900736ef0b89fe4770d98c5e1c9 /Dockerfile | |
| parent | cb03746137bc23f3c1b485088fefb9d4feffa368 (diff) | |
| parent | 30cd60cc2b2babda36ab752396df58697e9f26fd (diff) | |
| download | vis-2d6150426fe825cd7b179c5c3ed648ae607be122.tar.gz vis-2d6150426fe825cd7b179c5c3ed648ae607be122.tar.xz | |
Merge branch 'master' into add-layout-option
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -6,17 +6,17 @@ # docker cp vis:/tmp/vis/vis . # make vis-single # docker cp vis:/tmp/vis/vis-single . -FROM i386/alpine:3.9 +FROM i386/alpine:3.11 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 xz-dev tar xz wget ca-certificates + 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 wget https://github.com/martanne/libuntar/tarball/3f5e915ad8e6c5faa8dc6b34532e32b519f278f3 -O libuntar.tar.gz && \ +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 && \ |