aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc André Tanner <mat@brain-dump.org>2017-05-31 15:35:20 +0200
committerMarc André Tanner <mat@brain-dump.org>2017-05-31 15:38:44 +0200
commite72ccf8d6a5f167ef5e3b4df19c19bcb9f5ed263 (patch)
tree24a3878574de8e08cb7845cc4513230ccbce4c8c
parent04486663595085e91e5e766d58181c6e1b517c17 (diff)
downloadvis-e72ccf8d6a5f167ef5e3b4df19c19bcb9f5ed263.tar.gz
vis-e72ccf8d6a5f167ef5e3b4df19c19bcb9f5ed263.tar.xz
build: try to make docker build reproducible
-rw-r--r--Dockerfile2
-rw-r--r--Makefile3
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' >> $@