From cea50a860efae5576ca80164a84b56f18662a0ab Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandro@alejandrocelaya.com>
Date: Sun, 22 Mar 2020 10:01:34 +0100
Subject: [PATCH] Improved docker image generation

---
 .dockerignore | 7 ++-----
 Dockerfile    | 5 +++--
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 4559d3e2..46b96529 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -15,11 +15,8 @@ vendor
 docs
 indocker
 docker-*
-php*
-.php*
+phpstan.neon
 infection.json
 **/test*
 build*
-.git*
-.scrutinizer.yml
-.travis.yml
+**/.*
diff --git a/Dockerfile b/Dockerfile
index 1eb2715b..64cd7ebe 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -40,9 +40,10 @@ RUN wget https://download.microsoft.com/download/e/4/e/e4e67866-dffd-428c-aac7-8
 FROM base as builder
 COPY . .
 COPY --from=composer:1.10.1 /usr/bin/composer ./composer.phar
-RUN php composer.phar install --no-dev --optimize-autoloader --prefer-dist --no-progress --no-interaction && \
+RUN apk add --no-cache git && \
+    php composer.phar install --no-dev --optimize-autoloader --prefer-dist --no-progress --no-interaction && \
     php composer.phar clear-cache && \
-    rm composer.* && \
+    rm -r docker composer.* && \
     sed -i "s/%SHLINK_VERSION%/${SHLINK_VERSION}/g" config/autoload/app_options.global.php