From ae64a3388c6230cc6cee6bac9629013f351767c8 Mon Sep 17 00:00:00 2001
From: sparklyballs <sparklyballs@gmail.com>
Date: Thu, 5 Nov 2015 09:14:18 +0000
Subject: [PATCH] restructure docker file, move inits, bringing up to latest
 baseimage specs

---
 Dockerfile                                    | 57 +++++--------------
 ...set_the_config.sh => 30_set_the_config.sh} |  0
 ...rt_app.sh => 40_define_world_start_app.sh} |  0
 3 files changed, 15 insertions(+), 42 deletions(-)
 rename init/{20_set_the_config.sh => 30_set_the_config.sh} (100%)
 rename init/{30_define_world_start_app.sh => 40_define_world_start_app.sh} (100%)

diff --git a/Dockerfile b/Dockerfile
index ec67ff2..c482d4d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,15 @@
-# set base os
 FROM linuxserver/baseimage
 
 MAINTAINER Sparklyballs <sparklyballs@linuxserver.io>
 
-# Set correct environment variables
-ENV DEBIAN_FRONTEND=noninteractive HOME="/root" TERM=xterm LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 \
 
-MINETEST_SUBGAME_PATH="/config/.minetest/games" \
+ENV APTLIST="libbz2-dev libleveldb-dev luajit libluajit-5.1-dev libsqlite3-dev libcurl4-gnutls-dev libfreetype6-dev libhiredis0.10 libjsoncpp-dev"
+ENV BUILD_APTLIST="build-essential git-core gettext cmake doxygen libirrlicht-dev libjpeg-dev libxxf86vm-dev libogg-dev libvorbis-dev libopenal-dev zlib1g-dev libgmp-dev libpng12-dev libgl1-mesa-dev libhiredis-dev"
 
-configOPTS="-DENABLE_GETTEXT=TRUE \
+# Set environment variables
+ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 MINETEST_SUBGAME_PATH="/config/.minetest/games"
+
+ENV configOPTS="-DENABLE_GETTEXT=TRUE \
 -DENABLE_SOUND=FALSE \
 -DENABLE_LUAJIT=TRUE \
 -DENABLE_CURL=TRUE \
@@ -17,45 +18,18 @@ configOPTS="-DENABLE_GETTEXT=TRUE \
 -DENABLE_SYSTEM_GMP=TRUE \
 -DENABLE_LEVELDB=TRUE \
 -DRUN_IN_PLACE=FALSE \
--DBUILD_SERVER=TRUE " \
+-DBUILD_SERVER=TRUE "
 
-buildDeps="build-essential \
-git-core \
-gettext \
-cmake \
-doxygen \
-libirrlicht-dev \
-libjpeg-dev \
-libxxf86vm-dev \
-libogg-dev \
-libvorbis-dev \
-libopenal-dev \
-zlib1g-dev \
-libgmp-dev \
-libpng12-dev \
-libgl1-mesa-dev \
-libhiredis-dev" \
-
-buildDepsPerm="libbz2-dev \
-libleveldb-dev \
-luajit \
-libluajit-5.1-dev \
-libsqlite3-dev \
-libcurl4-gnutls-dev \
-libfreetype6-dev \
-libjsoncpp-dev" \
-
-runtimeDeps="libhiredis0.10"
 
 # Set the locale
 RUN locale-gen en_US.UTF-8 && \
 
 # update apt and install build dependencies
-apt-get update -qq && \
+apt-get update -q && \
 apt-get install \
 --no-install-recommends \
-$buildDepsPerm \
-$buildDeps -qy && \
+$APTLIST \
+$BUILD_APTLIST -qy && \
 
 # clone minitest git repository
 cd /tmp && \
@@ -69,7 +43,7 @@ $configOPTS && \
 make && \
 make install && \
 
-# copy games to temporary folder 
+# copy games to temporary folder
 mkdir -p /defaults/games && \
 cp -pr  /usr/local/share/minetest/games/* /defaults/games/ && \
 
@@ -78,21 +52,20 @@ git clone --depth 1 https://github.com/minetest/minetest_game.git /defaults/game
 
 # clean build dependencies
 apt-get purge --remove \
-$buildDeps -qy && \
+$BUILD_APTLIST -qy && \
 apt-get autoremove -y && \
 
-# install runtime dependencies
+# install runtime dependencies (makes sure we haven't deleted needed packages with removal above)
 apt-get install \
 --no-install-recommends \
-$buildDepsPerm \
-$runtimeDeps -qy && \
+$APTLIST -qy && \
 
 #clean up
 cd / && \
 apt-get clean && \
 rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-# add some files 
+# add some files
 ADD init/ /etc/my_init.d/
 RUN chmod -v +x /etc/service/*/run /etc/my_init.d/*.sh && \
 
diff --git a/init/20_set_the_config.sh b/init/30_set_the_config.sh
similarity index 100%
rename from init/20_set_the_config.sh
rename to init/30_set_the_config.sh
diff --git a/init/30_define_world_start_app.sh b/init/40_define_world_start_app.sh
similarity index 100%
rename from init/30_define_world_start_app.sh
rename to init/40_define_world_start_app.sh