Install vim & less packages + reorganize dependencies

davidlemaitre · Mar 9, 2021 · 7526b80 · 7526b80
1 parent b887ee9
commit 7526b80
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 9 deletions.
diff --git a/7.0/stretch/fpm/Dockerfile b/7.0/stretch/fpm/Dockerfile
@@ -4,18 +4,23 @@ 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 \
         libmcrypt-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.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
@@ -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