From 2817c9201e3fa8a93549c4e96a0155ab148fa0f9 Mon Sep 17 00:00:00 2001
From: Gitouche <26656-gitouche@users.noreply.framagit.org>
Date: Thu, 26 Oct 2023 18:00:39 +0200
Subject: [PATCH] framadate : fix bugs - contruction image par branch+commit

---
 podman-framadate/ci_build-images.sh      | 5 ++++-
 podman-framadate/container/Containerfile | 6 ++++--
 podman-framadate/vars.sh                 | 4 +++-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/podman-framadate/ci_build-images.sh b/podman-framadate/ci_build-images.sh
index 3d556cf..50830d9 100755
--- a/podman-framadate/ci_build-images.sh
+++ b/podman-framadate/ci_build-images.sh
@@ -8,7 +8,10 @@ ensure_pwd_is_scriptdir
 ensure_not_root
 
 if ! podman image exists ${framadate_image}:${framadate_version}; then
-    podman image build -t "${framadate_image}":"${framadate_version}" --build-arg=version="${framadate_version}" container/
+    podman image build -t "${framadate_image}":"${framadate_version}" \
+           --build-arg=branch="${framadate_branch}" \
+           --build-arg=commit="${framadate_commit}" \
+           container/
 else
     echo "Image ${framadate_image}:${framadate_version} already built"
 fi &&
diff --git a/podman-framadate/container/Containerfile b/podman-framadate/container/Containerfile
index 14a48bf..a2af149 100644
--- a/podman-framadate/container/Containerfile
+++ b/podman-framadate/container/Containerfile
@@ -1,6 +1,7 @@
 FROM docker.io/library/php:8-apache
 
-ARG version
+ARG branch
+ARG commit
 
 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 \
@@ -26,7 +27,8 @@ ENV COMPOSER_ALLOW_SUPERUSER 0
 
 WORKDIR /var/www/framadate
 
-RUN git clone -b $version --depth=1 https://framagit.org/framasoft/framadate/framadate.git . \
+RUN git clone -b $branch https://framagit.org/framasoft/framadate/framadate.git . \
+ && git checkout $commit \
  && 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 \
diff --git a/podman-framadate/vars.sh b/podman-framadate/vars.sh
index 524a2a8..511eb2a 100644
--- a/podman-framadate/vars.sh
+++ b/podman-framadate/vars.sh
@@ -1,7 +1,9 @@
 #!/usr/bin/env bash
 ## vars
 framadate_image='git.garbaye.fr/garbaye/framadate-app'
-framadate_version='1.1.19'
+framadate_version='1.1.19_1'
+framadate_branch='v1.1.x'
+framadate_commit='ffdfdb9823e9ebed7b82d21417faf01f8d871278'
 mysql_image='docker.io/library/mariadb'
 mysql_version='10.10'
 ## default vars : override with ENV var