Garbaye/services-garbaye
3
1
Fork 0
Code Issues 5 Pull requests Packages Projects Releases Wiki Activity

framadate : fix bugs - contruction image par branch+commit

Browse source
This commit is contained in:
Gitouche 2023-10-26 18:00:39 +02:00
parent 0f5ddbed71
commit 2817c9201e
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
podman-framadate/ci_build-images.sh
View file

@ -8,7 +8,10 @@ ensure_pwd_is_scriptdir
ensure_not_root ensure_not_root
if ! podman image exists ${framadate_image}:${framadate_version}; then 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 else
echo "Image ${framadate_image}:${framadate_version} already built" echo "Image ${framadate_image}:${framadate_version} already built"
fi && fi &&

6
podman-framadate/container/Containerfile
View file

@ -1,6 +1,7 @@
FROM docker.io/library/php:8-apache FROM docker.io/library/php:8-apache
ARG version ARG branch
ARG commit
RUN apt-get -y update \ 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 \ && 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 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 \ && sed -i -e 's|"smarty/smarty": "^4.0",|"smarty/smarty": "^4.3",|' /var/www/framadate/composer.json \
&& chown -R 33:33 . \ && 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 \ && 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 \

4
podman-framadate/vars.sh
View file

@ -1,7 +1,9 @@
#!/usr/bin/env bash #!/usr/bin/env bash
## vars ## vars
framadate_image='git.garbaye.fr/garbaye/framadate-app' 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_image='docker.io/library/mariadb'
mysql_version='10.10' mysql_version='10.10'
## default vars : override with ENV var ## default vars : override with ENV var