From 7526b80d44f229a884210efb8f9a599c4cd0ff61 Mon Sep 17 00:00:00 2001
From: David Lemaitre <david.lemaitre@ausy.fr>
Date: Tue, 9 Mar 2021 21:46:26 +0100
Subject: [PATCH] Install vim & less packages + reorganize dependencies

---
 7.0/stretch/fpm/Dockerfile | 11 ++++++++---
 7.3/stretch/fpm/Dockerfile | 11 ++++++++---
 7.4/buster/fpm/Dockerfile  | 11 ++++++++---
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/7.0/stretch/fpm/Dockerfile b/7.0/stretch/fpm/Dockerfile
index bf49fd8..9605aba 100644
--- a/7.0/stretch/fpm/Dockerfile
+++ b/7.0/stretch/fpm/Dockerfile
@@ -4,9 +4,9 @@ LABEL maintainer="David Lemaitre"
 # Install dependencies
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
-        default-mysql-client \
-        git \
         imagemagick \
+        locales \
+        # Needed for PHP extensions
         libfreetype6-dev \
         libicu-dev \
         libjpeg62-turbo-dev \
@@ -14,8 +14,13 @@ RUN apt-get update \
         libpng-dev \
         libxslt-dev \
         libzip-dev \
-        locales \
+        # Needed for Composer
+        git \
         unzip \
+        # Useful tools
+        less \
+        mariadb-client \
+        vim \
     && rm -rf /var/lib/apt/lists/*
 
 # Install PHP extensions
diff --git a/7.3/stretch/fpm/Dockerfile b/7.3/stretch/fpm/Dockerfile
index 57a2561..129b4b8 100644
--- a/7.3/stretch/fpm/Dockerfile
+++ b/7.3/stretch/fpm/Dockerfile
@@ -4,17 +4,22 @@ LABEL maintainer="David Lemaitre"
 # Install dependencies
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
-        default-mysql-client \
-        git \
         imagemagick \
+        locales \
+        # Needed for PHP extensions
         libfreetype6-dev \
         libicu-dev \
         libjpeg62-turbo-dev \
         libpng-dev \
         libxslt-dev \
         libzip-dev \
-        locales \
+        # Needed for Composer
+        git \
         unzip \
+        # Useful tools
+        less \
+        mariadb-client \
+        vim \
     && rm -rf /var/lib/apt/lists/*
 
 # Install PHP extensions
diff --git a/7.4/buster/fpm/Dockerfile b/7.4/buster/fpm/Dockerfile
index ef8a5ff..5863ef0 100644
--- a/7.4/buster/fpm/Dockerfile
+++ b/7.4/buster/fpm/Dockerfile
@@ -4,17 +4,22 @@ LABEL maintainer="David Lemaitre"
 # Install dependencies
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
-        default-mysql-client \
-        git \
         imagemagick \
+        locales \
+        # Needed for PHP extensions
         libfreetype6-dev \
         libicu-dev \
         libjpeg62-turbo-dev \
         libpng-dev \
         libxslt-dev \
         libzip-dev \
-        locales \
+        # Needed for Composer
+        git \
         unzip \
+        # Useful tools
+        less \
+        mariadb-client \
+        vim \
     && rm -rf /var/lib/apt/lists/*
 
 # Install PHP extensions