From 0e04f166efdfab7edb0295d10d58582ed6d0c05c Mon Sep 17 00:00:00 2001 From: Lynnesbian Date: Thu, 9 Apr 2020 02:03:45 +1000 Subject: [PATCH] remove unnecessary dependencies from dockerfiles, download license if not present --- docker/Dockerfile-armv7l | 15 +++------------ docker/Dockerfile-i686 | 15 +++------------ docker/Dockerfile-x86_64 | 15 +++------------ docker/build.sh | 5 +---- tarball/build.sh | 3 ++- 5 files changed, 12 insertions(+), 41 deletions(-) diff --git a/docker/Dockerfile-armv7l b/docker/Dockerfile-armv7l index 2a7a342..1661c0a 100644 --- a/docker/Dockerfile-armv7l +++ b/docker/Dockerfile-armv7l @@ -1,19 +1,10 @@ FROM arm32v7/debian:jessie # 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 -# ADD SDL2-2.0.10.tar.gz /tmp/ -# 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 +# install the new stuff +RUN apt-get install -y luajit libsdl2-dev libopenal1 libluajit-5.1-dev # Add the build script ADD build.sh /build/ diff --git a/docker/Dockerfile-i686 b/docker/Dockerfile-i686 index e485b61..0e0b694 100644 --- a/docker/Dockerfile-i686 +++ b/docker/Dockerfile-i686 @@ -1,19 +1,10 @@ FROM i386/debian:jessie # 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 -# ADD SDL2-2.0.10.tar.gz /tmp/ -# 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 +# install the new stuff +RUN apt-get install -y luajit libsdl2-dev libopenal1 libluajit-5.1-dev # Add the build script ADD build.sh /build/ diff --git a/docker/Dockerfile-x86_64 b/docker/Dockerfile-x86_64 index 4de1092..8a3c06e 100644 --- a/docker/Dockerfile-x86_64 +++ b/docker/Dockerfile-x86_64 @@ -1,19 +1,10 @@ FROM amd64/debian:oldstable # 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 -# ADD SDL2-2.0.10.tar.gz /tmp/ -# 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 +# install the new stuff +RUN apt-get install -y luajit libsdl2-dev libopenal1 libluajit-5.1-dev # Add the build script ADD build.sh /build/ diff --git a/docker/build.sh b/docker/build.sh index 86f3d2c..6b6047a 100755 --- a/docker/build.sh +++ b/docker/build.sh @@ -14,9 +14,6 @@ msg() { printf "\033[1m· %s\033[0m\n" "$1" } -# print the linux version being used -msg "Building with `lsb_release -ds`" - buildlove() { pushd ../love @@ -36,7 +33,7 @@ buildlove() { ./configure --prefix=/usr msg "Running make" - make all install + make -j`nproc` all install popd } diff --git a/tarball/build.sh b/tarball/build.sh index d5de766..b83f502 100755 --- a/tarball/build.sh +++ b/tarball/build.sh @@ -84,7 +84,8 @@ main() if test -f "license.txt"; then cp "license.txt" "$DEST" 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 }