diff options
| author | Christian Hesse <mail@eworm.de> | 2020-01-28 14:03:50 +0100 |
|---|---|---|
| committer | Marc André Tanner <mat@brain-dump.org> | 2020-01-30 11:38:45 +0100 |
| commit | 6f571a8f39ba975d263203d3def9bad05d92260e (patch) | |
| tree | 7cd49341e9d7727e33c9560ffaa6f36df79ee200 | |
| parent | 91d49a0dd0feac1a97b63091ce7f6f32e619fff8 (diff) | |
| download | vis-6f571a8f39ba975d263203d3def9bad05d92260e.tar.gz vis-6f571a8f39ba975d263203d3def9bad05d92260e.tar.xz | |
build: clean up docker build
| -rw-r--r-- | Dockerfile | 19 | ||||
| -rw-r--r-- | Makefile | 9 |
2 files changed, 11 insertions, 17 deletions
@@ -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"] @@ -88,11 +88,10 @@ docker: clean docker run --rm -d --name vis vis tail -f /dev/null docker exec vis apk update docker exec vis apk upgrade - docker cp . vis:/tmp/vis - docker exec vis sed -i '/^VERSION/c VERSION = $(VERSION)' Makefile - docker exec vis ./configure CC='cc --static' --enable-acl - docker exec vis make clean vis-single - docker cp vis:/tmp/vis/vis-single vis + docker cp . vis:/build/vis + docker exec vis ./vis/configure CC='cc --static' --enable-acl + docker exec vis make -C vis VERSION="$(VERSION)" clean vis-single + docker cp vis:/build/vis/vis-single vis docker kill vis debug: clean |