bug: Fix building with Lua images
This commit is contained in:
parent
389804bc73
commit
422c27eedb
7 changed files with 95 additions and 5 deletions
4
Justfile
4
Justfile
|
@ -2,9 +2,9 @@ build image:
|
|||
docker build -t {{image}} {{image}}
|
||||
docker tag {{image}} {{image}}:dev
|
||||
|
||||
tag image version:
|
||||
tag image version='latest':
|
||||
docker tag {{image}} {{image}}:{{version}}
|
||||
|
||||
push host image version:
|
||||
push host image version='latest':
|
||||
docker tag {{image}}:{{version}} {{host}}/{{image}}:{{version}}
|
||||
docker push {{host}}/{{image}}:{{version}}
|
||||
|
|
|
@ -5,5 +5,6 @@ RUN set -e; \
|
|||
apt-get install -y --no-install-recommends \
|
||||
gobject-introspection \
|
||||
libgirepository1.0-dev \
|
||||
libglib2.0-dev \
|
||||
libpulse-dev; \
|
||||
rm -rf /var/cache/apt/*
|
||||
|
|
|
@ -7,22 +7,26 @@ RUN set -e; \
|
|||
apt-get install -y --no-install-recommends \
|
||||
ca-certificates \
|
||||
cmake \
|
||||
curl \
|
||||
gcc \
|
||||
g++ \
|
||||
libc-dev \
|
||||
libreadline-dev \
|
||||
nodejs \
|
||||
npm \
|
||||
make \
|
||||
stow \
|
||||
sudo \
|
||||
unzip \
|
||||
wget; \
|
||||
wget \
|
||||
xz-utils; \
|
||||
rm -rf /var/cache/apt/*
|
||||
|
||||
WORKDIR /build
|
||||
|
||||
RUN set -e; \
|
||||
wget https://nodejs.org/dist/v16.17.0/node-v16.17.0-linux-x64.tar.xz; \
|
||||
mkdir -p /usr/local/stow/node; \
|
||||
tar -xJf node-v16.17.0-linux-x64.tar.xz -C /usr/local/stow/node --strip-components=1; \
|
||||
stow -d /usr/local/stow -t /usr/local -S node; \
|
||||
wget http://www.lua.org/ftp/lua-5.1.5.tar.gz; \
|
||||
tar -xzf lua-5.1.5.tar.gz; \
|
||||
cd lua-5.1.5/src; \
|
||||
|
@ -64,6 +68,11 @@ RUN set -e; \
|
|||
cd /; \
|
||||
rm -r /build
|
||||
|
||||
RUN set -e; \
|
||||
luarocks install ldoc; \
|
||||
luarocks install lua-discount
|
||||
|
||||
WORKDIR /
|
||||
|
||||
COPY pkgconfig/*.pc /usr/lib/pkgconfig/
|
||||
COPY enable-lua disable-lua run-with-lua /usr/bin/
|
||||
|
|
20
lua-clib/pkgconfig/lua5.1.pc
Normal file
20
lua-clib/pkgconfig/lua5.1.pc
Normal file
|
@ -0,0 +1,20 @@
|
|||
V=5.1
|
||||
R=5.1.5
|
||||
|
||||
prefix=/usr/local/stow/lua${V}
|
||||
INSTALL_BIN=${prefix}/bin
|
||||
INSTALL_INC=${prefix}/include
|
||||
INSTALL_LIB=${prefix}/lib
|
||||
INSTALL_MAN=${prefix}/man/man1
|
||||
INSTALL_LMOD=${prefix}/share/lua/${V}
|
||||
INSTALL_CMOD=${prefix}/lib/lua/${V}
|
||||
exec_prefix=${prefix}
|
||||
libdir=${exec_prefix}/lib
|
||||
includedir=${prefix}/include
|
||||
|
||||
Name: Lua
|
||||
Description: An Extensible Extension Language
|
||||
Version: ${R}
|
||||
Requires:
|
||||
Libs: -L${libdir} -llua -lm
|
||||
Cflags: -I${includedir}
|
20
lua-clib/pkgconfig/lua5.2.pc
Normal file
20
lua-clib/pkgconfig/lua5.2.pc
Normal file
|
@ -0,0 +1,20 @@
|
|||
V=5.2
|
||||
R=5.2.4
|
||||
|
||||
prefix=/usr/local/stow/lua${V}
|
||||
INSTALL_BIN=${prefix}/bin
|
||||
INSTALL_INC=${prefix}/include
|
||||
INSTALL_LIB=${prefix}/lib
|
||||
INSTALL_MAN=${prefix}/man/man1
|
||||
INSTALL_LMOD=${prefix}/share/lua/${V}
|
||||
INSTALL_CMOD=${prefix}/lib/lua/${V}
|
||||
exec_prefix=${prefix}
|
||||
libdir=${exec_prefix}/lib
|
||||
includedir=${prefix}/include
|
||||
|
||||
Name: Lua
|
||||
Description: An Extensible Extension Language
|
||||
Version: ${R}
|
||||
Requires:
|
||||
Libs: -L${libdir} -llua -lm
|
||||
Cflags: -I${includedir}
|
20
lua-clib/pkgconfig/lua5.3.pc
Normal file
20
lua-clib/pkgconfig/lua5.3.pc
Normal file
|
@ -0,0 +1,20 @@
|
|||
V=5.3
|
||||
R=5.3.6
|
||||
|
||||
prefix=/usr/local/stow/lua${V}
|
||||
INSTALL_BIN=${prefix}/bin
|
||||
INSTALL_INC=${prefix}/include
|
||||
INSTALL_LIB=${prefix}/lib
|
||||
INSTALL_MAN=${prefix}/man/man1
|
||||
INSTALL_LMOD=${prefix}/share/lua/${V}
|
||||
INSTALL_CMOD=${prefix}/lib/lua/${V}
|
||||
exec_prefix=${prefix}
|
||||
libdir=${exec_prefix}/lib
|
||||
includedir=${prefix}/include
|
||||
|
||||
Name: Lua
|
||||
Description: An Extensible Extension Language
|
||||
Version: ${R}
|
||||
Requires:
|
||||
Libs: -L${libdir} -llua -lm
|
||||
Cflags: -I${includedir}
|
20
lua-clib/pkgconfig/lua5.4.pc
Normal file
20
lua-clib/pkgconfig/lua5.4.pc
Normal file
|
@ -0,0 +1,20 @@
|
|||
V=5.4
|
||||
R=5.4.4
|
||||
|
||||
prefix=/usr/local/stow/lua${V}
|
||||
INSTALL_BIN=${prefix}/bin
|
||||
INSTALL_INC=${prefix}/include
|
||||
INSTALL_LIB=${prefix}/lib
|
||||
INSTALL_MAN=${prefix}/man/man1
|
||||
INSTALL_LMOD=${prefix}/share/lua/${V}
|
||||
INSTALL_CMOD=${prefix}/lib/lua/${V}
|
||||
exec_prefix=${prefix}
|
||||
libdir=${exec_prefix}/lib
|
||||
includedir=${prefix}/include
|
||||
|
||||
Name: Lua
|
||||
Description: An Extensible Extension Language
|
||||
Version: ${R}
|
||||
Requires:
|
||||
Libs: -L${libdir} -llua -lm
|
||||
Cflags: -I${includedir}
|
Loading…
Add table
Reference in a new issue