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

Compare commits

base: Garbaye:2817c9201e3fa8a93549c4e96a0155ab148fa0f9
Branches Tags
Garbaye:main
..
compare: Garbaye:197b9b22883976ba305286f3b15003d45794b1fd
Branches Tags
Garbaye:main

2 commits
2817c9201e ... 197b9b2288

Author SHA1 Message Date
Gitouche 197b9b2288 framadate : tentative fix 2 2023-10-26 18:46:38 +02:00
Gitouche a916ddf744 Revert "framadate : fix bugs - contruction image par branch+commit" 
This reverts commit 2817c9201e.
 2023-10-26 18:45:00 +02:00
3 changed files with 5 additions and 11 deletions
Show stats Expand all files Collapse all files

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

@ -8,10 +8,7 @@ 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}" \ podman image build -t "${framadate_image}":"${framadate_version}" --build-arg=version="${framadate_version}" container/
--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 &&

7
podman-framadate/container/Containerfile
View file

@ -1,7 +1,6 @@
FROM docker.io/library/php:8-apache FROM docker.io/library/php:8-apache
ARG branch ARG version
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 \
@ -27,9 +26,9 @@ ENV COMPOSER_ALLOW_SUPERUSER 0
WORKDIR /var/www/framadate WORKDIR /var/www/framadate
RUN git clone -b $branch https://framagit.org/framasoft/framadate/framadate.git . \ RUN git clone -b $version --depth=1 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 \
&& sed -i -e 's|isset($admin)|isset($admin) \&\& $admin|g' /var/www/framadate/tpl/part/comments_list.tpl \
&& 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 \
&& rm /etc/apache2/sites-enabled/000-default.conf && rm /etc/apache2/sites-enabled/000-default.conf

4
podman-framadate/vars.sh
View file

@ -1,9 +1,7 @@
#!/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_1' framadate_version='1.1.19'
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