From e72ccf8d6a5f167ef5e3b4df19c19bcb9f5ed263 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Andr=C3=A9=20Tanner?= Date: Wed, 31 May 2017 15:35:20 +0200 Subject: build: try to make docker build reproducible --- Dockerfile | 2 +- Makefile | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 72644e6..463b5b3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ FROM 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 libarchive-dev xz-dev xz bzip2-dev +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 libarchive-dev xz-dev xz bzip2-dev tar 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 diff --git a/Makefile b/Makefile index 653657f..6be1b62 100644 --- a/Makefile +++ b/Makefile @@ -79,7 +79,8 @@ vis-single-payload.inc: $(EXECUTABLES) lua/* echo '#ifndef VIS_SINGLE_PAYLOAD_H' > $@ echo '#define VIS_SINGLE_PAYLOAD_H' >> $@ echo 'static unsigned char vis_single_payload[] = {' >> $@ - tar c $(EXECUTABLES) $$(find lua -name '*.lua') | xz | od -t x1 -A none -v | \ + tar --sort=name --mtime='2014-07-15 01:23Z' --owner=0 --group=0 --numeric-owner -c \ + $(EXECUTABLES) $$(find lua -name '*.lua') | xz | od -t x1 -A none -v | \ sed 's/\([0-9a-f]\+\)/0x\1,/g;$$s/,$$/ };/' >> $@ echo '#endif' >> $@ -- cgit v1.2.3