diff --git a/Dockerfile b/Dockerfile index c27a733..136a4c7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,6 +20,10 @@ ARG RUNTIME_DEPS # Install run-time dependencies RUN pacman --needed --noconfirm -Sq $RUNTIME_DEPS && yes | pacman -Sccq +# Setup LuaRocks for use with LuaJIT roughly matching SILE's internal VM +RUN luarocks --lua-version 5.1 config lua_interpreter luajit && \ + luarocks --lua-version 5.1 config variables.LUA "$(command -v luajit)" + # Set at build time, forces Docker’s layer caching to reset at this point ARG REVISION ARG VERSION @@ -27,7 +31,7 @@ ARG VERSION # Install fontproof in SILE container COPY ./ /src WORKDIR /src -RUN luarocks make fontproof-dev-1.rockspec +RUN luarocks --lua-version 5.1 make fontproof-dev-1.rockspec LABEL org.opencontainers.image.title="FontProof" LABEL org.opencontainers.image.description="A containerized version of FontProof" diff --git a/fontproof-dev-1.rockspec b/fontproof-dev-1.rockspec index 4f7ff2f..edee854 100644 --- a/fontproof-dev-1.rockspec +++ b/fontproof-dev-1.rockspec @@ -27,6 +27,10 @@ dependencies = { "lua_cliargs == 3.0-2" } +deploy = { + wrap_bin_scripts = true, +} + build = { type = "builtin", modules = { diff --git a/hooks/build b/hooks/build index 56b966f..c100872 100755 --- a/hooks/build +++ b/hooks/build @@ -8,7 +8,7 @@ set -e REVISION=$(git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g') -RUNTIME_DEPS='luarocks words' +RUNTIME_DEPS='luarocks luajit words' : "${DOCKER_BUILDKIT:=1}" export DOCKER_BUILDKIT