lynnesbian/love-linux-builder
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

remove unnecessary dependencies from dockerfiles, download license if not present

Browse source
This commit is contained in:
Lynne Megido 2020-04-09 02:03:45 +10:00
parent 2d6061b6c4
commit 0e04f166ef
Signed by: lynnesbian
GPG key ID: F0A184B5213D9F90
5 changed files with 12 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
docker/Dockerfile-armv7l
View file

@ -1,19 +1,10 @@
FROM arm32v7/debian:jessie FROM arm32v7/debian:jessie
# Install all sdl, love (build) deps and love-linux-builder deps # Install all sdl, love (build) deps and love-linux-builder deps
RUN apt-get update && apt-get install -y build-essential cmake libgl1-mesa-glx libgles2-mesa-dev libxrandr-dev libdbus-1-dev libxi-dev libxcursor-dev libxinerama-dev libgl1-mesa-dev libibus-1.0-dev libasound2-dev libpulse-dev libwayland-dev libfreetype6-dev libopenal-dev libmodplug-dev libvorbis-dev libtheora-dev libphysfs-dev libmpg123-dev squashfs-tools curl mercurial libfuse2 autotools-dev automake libtool pkg-config libdevil-dev luajit libsdl2-2.0-0 libopenal1 RUN apt-get update && apt-get install -y build-essential cmake libibus-1.0-dev libasound2-dev libpulse-dev libfreetype6-dev libopenal-dev libmodplug-dev libvorbis-dev libtheora-dev libphysfs-dev libmpg123-dev squashfs-tools curl mercurial libfuse2 autotools-dev automake libtool pkg-config libdevil-dev
# Now build sdl # install the new stuff
# ADD SDL2-2.0.10.tar.gz /tmp/ RUN apt-get install -y luajit libsdl2-dev libopenal1 libluajit-5.1-dev
# RUN cd /tmp/SDL2-2.0.10 && ./configure --prefix=/usr && make all install
# And build luajit
# ADD LuaJIT-2.0.5.tar.gz /tmp/
# RUN cd /tmp/LuaJIT-2.0.5 && make PREFIX=/usr all install
# And build a modern openal soft
# ADD openal-soft-1.19.1.tar.gz /tmp/
# RUN cd /tmp/openal-soft-openal-soft-1.19.1/build && cmake -DCMAKE_INSTALL_PREFIX=/usr .. && make all install
# Add the build script # Add the build script
ADD build.sh /build/ ADD build.sh /build/

15
docker/Dockerfile-i686
View file

@ -1,19 +1,10 @@
FROM i386/debian:jessie FROM i386/debian:jessie
# Install all sdl, love (build) deps and love-linux-builder deps # Install all sdl, love (build) deps and love-linux-builder deps
RUN apt-get update && apt-get install -y build-essential cmake libgl1-mesa-glx libgles2-mesa-dev libxrandr-dev libdbus-1-dev libxi-dev libxcursor-dev libxinerama-dev libgl1-mesa-dev libibus-1.0-dev libasound2-dev libpulse-dev libwayland-dev libfreetype6-dev libopenal-dev libmodplug-dev libvorbis-dev libtheora-dev libphysfs-dev libmpg123-dev squashfs-tools curl mercurial libfuse2 autotools-dev automake libtool pkg-config libdevil-dev luajit libsdl2-2.0-0 libopenal1 RUN apt-get update && apt-get install -y build-essential cmake libibus-1.0-dev libasound2-dev libpulse-dev libfreetype6-dev libopenal-dev libmodplug-dev libvorbis-dev libtheora-dev libphysfs-dev libmpg123-dev squashfs-tools curl mercurial libfuse2 autotools-dev automake libtool pkg-config libdevil-dev
# Now build sdl # install the new stuff
# ADD SDL2-2.0.10.tar.gz /tmp/ RUN apt-get install -y luajit libsdl2-dev libopenal1 libluajit-5.1-dev
# RUN cd /tmp/SDL2-2.0.10 && ./configure --prefix=/usr && make all install
# And build luajit
# ADD LuaJIT-2.0.5.tar.gz /tmp/
# RUN cd /tmp/LuaJIT-2.0.5 && make PREFIX=/usr all install
# And build a modern openal soft
# ADD openal-soft-1.19.1.tar.gz /tmp/
# RUN cd /tmp/openal-soft-openal-soft-1.19.1/build && cmake -DCMAKE_INSTALL_PREFIX=/usr .. && make all install
# Add the build script # Add the build script
ADD build.sh /build/ ADD build.sh /build/

15
docker/Dockerfile-x86_64
View file

@ -1,19 +1,10 @@
FROM amd64/debian:oldstable FROM amd64/debian:oldstable
# Install all sdl, love (build) deps and love-linux-builder deps # Install all sdl, love (build) deps and love-linux-builder deps
RUN apt-get update && apt-get install -y build-essential cmake libgl1-mesa-glx libgles2-mesa-dev libxrandr-dev libdbus-1-dev libxi-dev libxcursor-dev libxinerama-dev libgl1-mesa-dev libibus-1.0-dev libasound2-dev libpulse-dev libwayland-dev libfreetype6-dev libopenal-dev libmodplug-dev libvorbis-dev libtheora-dev libphysfs-dev libmpg123-dev squashfs-tools curl mercurial libfuse2 autotools-dev automake libtool pkg-config libdevil-dev luajit libsdl2-2.0-0 libopenal1 RUN apt-get update && apt-get install -y build-essential cmake libibus-1.0-dev libasound2-dev libpulse-dev libfreetype6-dev libopenal-dev libmodplug-dev libvorbis-dev libtheora-dev libphysfs-dev libmpg123-dev squashfs-tools curl mercurial libfuse2 autotools-dev automake libtool pkg-config libdevil-dev
# Now build sdl # install the new stuff
# ADD SDL2-2.0.10.tar.gz /tmp/ RUN apt-get install -y luajit libsdl2-dev libopenal1 libluajit-5.1-dev
# RUN cd /tmp/SDL2-2.0.10 && ./configure --prefix=/usr && make all install
# And build luajit
# ADD LuaJIT-2.0.5.tar.gz /tmp/
# RUN cd /tmp/LuaJIT-2.0.5 && make PREFIX=/usr all install
# And build a modern openal soft
# ADD openal-soft-1.19.1.tar.gz /tmp/
# RUN cd /tmp/openal-soft-openal-soft-1.19.1/build && cmake -DCMAKE_INSTALL_PREFIX=/usr .. && make all install
# Add the build script # Add the build script
ADD build.sh /build/ ADD build.sh /build/

5
docker/build.sh
View file

@ -14,9 +14,6 @@ msg() {
printf "\033[1m· %s\033[0m\n" "$1" printf "\033[1m· %s\033[0m\n" "$1"
} }
# print the linux version being used
msg "Building with `lsb_release -ds`"
buildlove() { buildlove() {
pushd ../love pushd ../love
@ -36,7 +33,7 @@ buildlove() {
./configure --prefix=/usr ./configure --prefix=/usr
msg "Running make" msg "Running make"
make all install make -j`nproc` all install
popd popd
} }

3
tarball/build.sh
View file

@ -84,7 +84,8 @@ main()
if test -f "license.txt"; then if test -f "license.txt"; then
cp "license.txt" "$DEST" cp "license.txt" "$DEST"
else else
echo "No license.txt file found, skipping" echo "No license.txt file found, downloading from GitHub"
curl "https://raw.githubusercontent.com/love2d/love/${VERSION}/license.txt" -o "$DEST/license.txt"
fi fi
} }