Dockerfile: correct `apt clean` + git clone --depth 1 + remove .git (#8697)

diff --git a/Dockerfile b/Dockerfile
index 27734119e40c23bfeddda5c8f340a2698d0c276f..c465be14a45a0a6536cdb667ebe0542c36683630 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,9 +3,7 @@ FROM debian:stretch
 USER root
 RUN apt-get update -y && \
        apt-get -y install build-essential libirrlicht-dev cmake libbz2-dev libpng-dev libjpeg-dev \
-               libsqlite3-dev libcurl4-gnutls-dev zlib1g-dev libgmp-dev libjsoncpp-dev git && \
-               apt-get clean && rm -rf /var/cache/apt/archives/* && \
-               rm -rf /var/lib/apt/lists/*
+               libsqlite3-dev libcurl4-gnutls-dev zlib1g-dev libgmp-dev libjsoncpp-dev git
 
 COPY . /usr/src/minetest
 
@@ -16,7 +14,8 @@ RUN   mkdir -p /usr/src/minetest/cmakebuild && cd /usr/src/minetest/cmakebuild &&
                -DENABLE_SYSTEM_JSONCPP=1 \
                .. && \
                make -j2 && \
-               rm -Rf ../games/minetest_game && git clone https://github.com/minetest/minetest_game ../games/minetest_game && \
+               rm -Rf ../games/minetest_game && git clone --depth 1 https://github.com/minetest/minetest_game ../games/minetest_game && \
+               rm -Rf ../games/minetest_game/.git
                make install
 
 FROM debian:stretch
@@ -25,7 +24,9 @@ USER root
 RUN groupadd minetest && useradd -m -g minetest -d /var/lib/minetest minetest && \
     apt-get update -y && \
     apt-get -y install libcurl3-gnutls libjsoncpp1 liblua5.1-0 libluajit-5.1-2 libpq5 libsqlite3-0 \
-        libstdc++6 zlib1g libc6
+        libstdc++6 zlib1g libc6 && \
+    apt-get clean && rm -rf /var/cache/apt/archives/* && \
+    rm -rf /var/lib/apt/lists/*
 
 WORKDIR /var/lib/minetest