From c5c66efbd71c85b3a8b2de1a3d148fecef1febbc Mon Sep 17 00:00:00 2001
From: Gitouche <26656-gitouche@users.noreply.framagit.org>
Date: Thu, 26 Oct 2023 12:04:47 +0200
Subject: [PATCH] framadate : hadolint Containerfile

---
 podman-framadate/container/Containerfile | 27 ++++++++++++------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/podman-framadate/container/Containerfile b/podman-framadate/container/Containerfile
index 7289451..14a48bf 100644
--- a/podman-framadate/container/Containerfile
+++ b/podman-framadate/container/Containerfile
@@ -2,11 +2,15 @@ FROM docker.io/library/php:8-apache
 
 ARG version
 
-RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get install -y -qq zip unzip git zlib1g-dev libicu-dev g++ default-mysql-client git locales
-RUN sed -i '/fr_FR.UTF-8/s/^# //g' /etc/locale.gen && locale-gen
-RUN docker-php-ext-install intl && docker-php-ext-install pdo_mysql
-
-RUN a2enmod rewrite
+RUN apt-get -y update \
+ && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y -qq zip unzip git zlib1g-dev libicu-dev g++ default-mysql-client git locales \
+ && apt-get clean \
+ && rm -rf /var/lib/apt/lists/* \
+ && sed -i '/fr_FR.UTF-8/s/^# //g' /etc/locale.gen \
+ && locale-gen \
+ && docker-php-ext-install intl \
+ && docker-php-ext-install pdo_mysql \
+ && a2enmod rewrite
 
 COPY --from=docker.io/library/composer:2.2 /usr/bin/composer /usr/bin/composer
 
@@ -22,13 +26,10 @@ ENV COMPOSER_ALLOW_SUPERUSER 0
 
 WORKDIR /var/www/framadate
 
-RUN git clone -b $version --depth=1 https://framagit.org/framasoft/framadate/framadate.git .
-RUN sed -i -e 's|"smarty/smarty": "^4.0",|"smarty/smarty": "^4.3",|' /var/www/framadate/composer.json
-RUN chown -R 33:33 .
-
-# Some Apache and PHP configuration
-RUN if [ "$ENV" = "dev" ] ; then echo Using PHP production mode ; else echo Using PHP development mode && echo "error_reporting = E_ERROR | E_WARNING | E_PARSE\ndisplay_errors = On" > /usr/local/etc/php/conf.d/php.ini ; fi
-
-RUN rm /etc/apache2/sites-enabled/000-default.conf
+RUN git clone -b $version --depth=1 https://framagit.org/framasoft/framadate/framadate.git . \
+ && sed -i -e 's|"smarty/smarty": "^4.0",|"smarty/smarty": "^4.3",|' /var/www/framadate/composer.json \
+ && chown -R 33:33 . \
+ && if [ "$ENV" = "dev" ] ; then echo Using PHP production mode ; else echo Using PHP development mode && echo "error_reporting = E_ERROR | E_WARNING | E_PARSE\ndisplay_errors = On" > /usr/local/etc/php/conf.d/php.ini ; fi \
+ && rm /etc/apache2/sites-enabled/000-default.conf
 EXPOSE 80
 ENTRYPOINT ["entrypoint"]