From 1e19ceb20aeeb5c427416ccd8067e60241c152f0 Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Mon, 1 Jul 2019 16:26:56 +0200 Subject: build: update alpine in docker build to version 3.10 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index 037556a..7bd9649 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ # 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.10 ENV DIR /tmp/vis WORKDIR $DIR RUN apk update && apk add musl-dev fortify-headers gcc make libtermkey-dev \ -- cgit v1.2.3 From 50b0a580105ac976a1c95df9441d898d7a652bfb Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Fri, 3 Jan 2020 22:00:14 +0100 Subject: build: update alpine in docker build to version 3.11 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index 7bd9649..2bfbe4b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ # docker cp vis:/tmp/vis/vis . # make vis-single # docker cp vis:/tmp/vis/vis-single . -FROM i386/alpine:3.10 +FROM i386/alpine:3.11 ENV DIR /tmp/vis WORKDIR $DIR RUN apk update && apk add musl-dev fortify-headers gcc make libtermkey-dev \ -- cgit v1.2.3 From 5d610affb2d5332a417248a32da81acf72ea8e4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Andr=C3=A9=20Tanner?= Date: Thu, 16 Jan 2020 16:18:13 +0100 Subject: build: update libuntar used in docker builds --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index 2bfbe4b..35cbd77 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ 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 && \ -- cgit v1.2.3 From 0ba252f08e9ef7b62c442eb91b36822d654f5b04 Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Thu, 16 Jan 2020 17:37:48 +0100 Subject: build: install static libacl for docker builds Commit 50b0a580105ac976a1c95df9441d898d7a652bfb updated Alpine docker image, however this broke building with acl support. The static libacl moved to its own package, so just install that. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index 35cbd77..fe246bb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ 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 -- cgit v1.2.3