From 846505cd9abb5071ec0f13b0b6d572420fdba464 Mon Sep 17 00:00:00 2001
From: Gitouche <26656-gitouche@users.noreply.framagit.org>
Date: Thu, 26 Oct 2023 19:26:26 +0200
Subject: [PATCH] framadate : debug

---
 podman-framadate/container/Containerfile | 6 +++++-
 podman-framadate/container/entrypoint.sh | 9 ---------
 podman-framadate/vars.sh                 | 1 +
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/podman-framadate/container/Containerfile b/podman-framadate/container/Containerfile
index 7d92f3d..81dd48f 100644
--- a/podman-framadate/container/Containerfile
+++ b/podman-framadate/container/Containerfile
@@ -31,6 +31,10 @@ RUN git clone -b $version --depth=1 https://framagit.org/framasoft/framadate/fra
  && sed -i -e 's|isset($admin)|isset($admin) \&\& $admin|g' /var/www/framadate/tpl/part/comments_list.tpl \
  && 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
+ && rm /etc/apache2/sites-enabled/000-default.conf \
+ && composer install -o --no-interaction --prefer-dist --no-dev \
+ && composer dump-autoload --optimize --no-dev --classmap-authoritative \
+ && composer update --no-interaction --no-dev
+
 EXPOSE 80
 ENTRYPOINT ["entrypoint"]
diff --git a/podman-framadate/container/entrypoint.sh b/podman-framadate/container/entrypoint.sh
index ff291a8..7e1be63 100755
--- a/podman-framadate/container/entrypoint.sh
+++ b/podman-framadate/container/entrypoint.sh
@@ -60,15 +60,6 @@ if [ ! -f /var/www/framadate/admin/.htpasswd ]; then
   fi
 fi
 
-if [ "$ENV" = "dev" ]; then
-  echo Installing PHP development dependencies
-  composer install --no-interaction --no-progress
-else
-  echo Installing PHP production dependencies
-  composer install -o  --no-interaction --no-progress --prefer-dist --no-dev
-  composer dump-autoload --optimize --no-dev --classmap-authoritative
-fi
-
 # Await MySQL Container being ready
 until /usr/bin/mysql --host=$MYSQL_HOST --user=$MYSQL_USER --password=$MYSQL_PASSWORD --silent --execute "SELECT 1;" $MYSQL_DB; do
   >&2 echo "MySQL is unavailable - sleeping"
diff --git a/podman-framadate/vars.sh b/podman-framadate/vars.sh
index 524a2a8..fedffaf 100644
--- a/podman-framadate/vars.sh
+++ b/podman-framadate/vars.sh
@@ -17,3 +17,4 @@ service_name="pod-${pod_name}.service"
 get_default_iface_ipv4 GARBAYE_FRAMADATE_SMTP_SERVER
 upstream_images="${framadate_image} docker.io/library/composer docker.io/library/mariadb docker.io/library/php docker.io/library/composer"
 dbvolume='podman-framadate_framadate-db'
+