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