From 6af32f65752f3d9ea7dc5e291871cef8445d95d1 Mon Sep 17 00:00:00 2001 From: Marco Ferrari Date: Tue, 28 May 2024 08:39:07 +0200 Subject: [PATCH] build: install lua from the os package repository (#5655) - Install lua and luarocks from the OS package repository instead of manually downloading them. Also the luarock fork looked unmaintained. - Remove luarocks from the image after installing lua packages because it's not needed after that --- scripts/install-lua.sh | 36 +++++++++--------------------------- 1 file changed, 9 insertions(+), 27 deletions(-) diff --git a/scripts/install-lua.sh b/scripts/install-lua.sh index cdc62622..42d1506f 100755 --- a/scripts/install-lua.sh +++ b/scripts/install-lua.sh @@ -2,39 +2,21 @@ set -euo pipefail +apk add --no-cache \ + lua5.4 + apk add --no-cache --virtual .lua-build-deps \ gcc \ + lua5.4-dev \ + luarocks5.4 \ make \ musl-dev \ readline-dev -curl --retry 5 --retry-delay 5 -s https://www.lua.org/ftp/lua-5.3.5.tar.gz | tar -xz -cd lua-5.3.5 -make linux -make install -cd .. && rm -r lua-5.3.5/ +ln -s /usr/bin/lua5.4 /usr/bin/lua -url=$( - set -euo pipefail - curl -s \ - -H "Accept: application/vnd.github+json" \ - -H "Authorization: Bearer $(cat /run/secrets/GITHUB_TOKEN)" \ - https://api.github.com/repos/cvega/luarocks/releases/latest | - jq -r '.tarball_url' -) -curl --retry 5 --retry-delay 5 -sL \ - -H "Accept: application/vnd.github+json" \ - -H "Authorization: Bearer $(cat /run/secrets/GITHUB_TOKEN)" \ - "${url}" | tar -xz -cd cvega-luarocks-6b1aee6 -./configure --with-lua-include=/usr/local/include -make -make -b install -cd .. -rm -r cvega-luarocks-6b1aee6 - -luarocks install luacheck -luarocks install argparse -luarocks install luafilesystem +luarocks-5.4 install luacheck +luarocks-5.4 install argparse +luarocks-5.4 install luafilesystem apk del --no-network --purge .lua-build-deps