Commit 742d83f1 authored by Christian BUFFIN's avatar Christian BUFFIN
Browse files

Mise à jour du Dockerfile (passaage en Ubuntu 20.04 LTS), mise à jour de la...

Mise à jour du Dockerfile (passaage en Ubuntu 20.04 LTS), mise à jour de la version maximale de PHP dans la vérification de l'application, mise à jour de la version de l'application, mise à jour du fichier composer.json pour la version minimale de PHP (7.2 vs. 7.4 à cause du support CentOS), la version de l'application et ajouter un développeur.
parent a77309a4
......@@ -75,8 +75,8 @@ abstract class WebdpoChecks
'Version' => LibricielChecksValidator::version(
'PHP',
PHP_MAJOR_VERSION . '.' . PHP_MINOR_VERSION . '.' . PHP_RELEASE_VERSION,
'7.0.0',
'7.3.0'
'7.2.0',
'7.5.0'
)
],
'extensions' => LibricielChecksPhp::checkExtensions(
......
{
"name": "web-dpo/web-dpo",
"description": "Gestion de vos traitements dans le cadre de la réglementation relative à la protection des données personnelles (RGPD)",
"version": "1.0.1",
"version": "2.0.0",
"authors": [
{
"name": "Théo GUILLON",
"email": "theo.guillon@libriciel.coop",
"homepage": "http://www.libriciel.fr",
"role": "Developer"
}
{
"name": "Théo GUILLON",
"email": "theo.guillon@libriciel.coop",
"homepage": "http://www.libriciel.fr",
"role": "Developer"
},
{
"name": "Christian BUFFIN",
"email": "christian.buffin@libriciel.coop",
"homepage": "http://www.libriciel.fr",
"role": "Developer"
}
],
"type": "cakephp-plugin",
"homepage": "https://www.libriciel.fr/web-dpo/",
"licence": "CECILL-2.1",
"config": {
"php": "7.0",
"php": "7.2",
"bin-dir": "vendors/bin",
"vendor-dir" : "vendors/",
"gitlab-domains": [
......@@ -64,7 +70,7 @@
}
],
"require": {
"php": ">=7.0.0",
"php": ">=7.2.0",
"ext-mcrypt": "*",
"composer/installers": "~1.0",
"cakephp/cakephp": "2.10.*",
......
FROM ubuntu:18.04
FROM ubuntu:20.04
#-------------------------------------------------------------------------------
# Labels
......@@ -33,64 +33,62 @@ RUN ( \
build-essential=12.* \
ca-certificates=* \
cron=3.0* \
curl=7.58.* \
curl=7.68.* \
gettext=0.19.* \
git=1:2.17.* \
htop=2.1.* \
iptables=1.6.* \
libapache2-mod-php7.2=7.2.* \
libecpg-dev=10.* \
git=1:2.25.* \
htop=2.2.* \
iptables=1.8.* \
libapache2-mod-php7.4=7.4.* \
libecpg-dev=12.* \
libmcrypt-dev=2.5.* \
libssh2-1=1.8.* \
libssl-dev=1.1.* \
locales=2.27-* \
netbase=5.4 \
locales=2.31-* \
netbase=6.1 \
php-imagick=3.4.* \
php-pear=1:1.10.* \
php-xdebug=2.6.* \
php7.2=7.2.* \
php7.2-cli=7.2.* \
php7.2-curl=7.2.* \
php7.2-dev=7.2.* \
php7.2-gd=7.2.* \
php7.2-ldap=7.2.* \
php7.2-mbstring=7.2.* \
php7.2-pgsql=7.2.* \
php7.2-soap=7.2.* \
php7.2-xml=7.2.* \
php7.2-xsl=7.2.* \
php7.2-zip=7.2.* \
poppler-utils=0.62.* \
postfix=3.3.* \
postgresql-client=10+* \
python3-pip=9.0.* \
python3-setuptools=39.0.* \
rsyslog=8.32.* \
ssh=1:7.6* \
software-properties-common=0.96.* \
php-xdebug=2.9.* \
php7.4=7.4.* \
php7.4-cli=7.4.* \
php7.4-curl=7.4.* \
php7.4-dev=7.4.* \
php7.4-gd=7.4.* \
php7.4-ldap=7.4.* \
php7.4-mbstring=7.4.* \
php7.4-pgsql=7.4.* \
php7.4-soap=7.4.* \
php7.4-xml=7.4.* \
php7.4-xsl=7.4.* \
php7.4-zip=7.4.* \
poppler-utils=0.86.* \
postfix=3.4.* \
postgresql-client=12+* \
python3-pip=20.0* \
python3-setuptools=45.2.* \
rsyslog=8.* \
ssh=1:8.* \
software-properties-common=0.98.* \
sudo=1.8.* \
tzdata=* \
unzip=6.0-* \
&& pecl channel-update pecl.php.net \
&& pecl install mcrypt-1.0.2 \
&& echo "extension=mcrypt.so" > /etc/php/7.2/mods-available/mcrypt.ini \
&& pecl install mcrypt-1.0.3 \
&& echo "extension=mcrypt.so" > /etc/php/7.4/mods-available/mcrypt.ini \
&& phpenmod mcrypt \
&& pear channel-update pear.php.net \
&& pear install XML_RPC2-1.1.4 \
&& pip3 install -Iv esprima==4.0.1 pgsanity==0.2.9 \
&& add-apt-repository ppa:malteworld/ppa \
&& apt-get update \
# @info: On installe node etc dans un second temps, sinon ça pose problème avec php7.2-dev
&& ( set +e ; add-apt-repository ppa:malteworld/ppa ; echo hack-404 > /dev/null ) \
&& ( set +e ; apt-get update ; echo hack-404 > /dev/null ) \
# @info: On installe node etc dans un second temps, sinon ça pose problème avec php7.4-dev
# @info: On installe pdftk également dans un second temps car on a besoin du paquet build-essential pour add-apt-repository
&& apt-get install \
--assume-yes \
--no-install-recommends \
--show-upgraded \
libssl1.0-dev=1.0.* \
nodejs-dev=8.10.* \
node-gyp=3.6.* \
npm=3.5.* \
pdftk=3.0.* \
node-gyp=6.1.* \
npm=6.14.* \
pdftk=2.02-* \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* \
)
......@@ -106,11 +104,11 @@ COPY docker/app/usr/bin/docker-entrypoint.sh /usr/bin/docker-entrypoint.sh
RUN ( \
set -eux \
&& locale-gen ${LANG} \
&& echo "date.timezone = \"${DOCKER_TIMEZONE}\";" > /etc/php/7.2/apache2/conf.d/10-date.ini \
&& echo "date.timezone = \"${DOCKER_TIMEZONE}\";" > /etc/php/7.2/cli/conf.d/10-date.ini \
&& sed -i 's/max_execution_time = .*$/max_execution_time = 3600/g' /etc/php/7.2/apache2/php.ini /etc/php/7.2/cli/php.ini \
&& sed -i 's/post_max_size = .*$/post_max_size = 50M/g' /etc/php/7.2/apache2/php.ini /etc/php/7.2/cli/php.ini \
&& sed -i 's/upload_max_filesize = .*$/upload_max_filesize = 50M/g' /etc/php/7.2/apache2/php.ini /etc/php/7.2/cli/php.ini \
&& echo "date.timezone = \"${DOCKER_TIMEZONE}\";" > /etc/php/7.4/apache2/conf.d/10-date.ini \
&& echo "date.timezone = \"${DOCKER_TIMEZONE}\";" > /etc/php/7.4/cli/conf.d/10-date.ini \
&& sed -i 's/max_execution_time = .*$/max_execution_time = 3600/g' /etc/php/7.4/apache2/php.ini /etc/php/7.4/cli/php.ini \
&& sed -i 's/post_max_size = .*$/post_max_size = 50M/g' /etc/php/7.4/apache2/php.ini /etc/php/7.4/cli/php.ini \
&& sed -i 's/upload_max_filesize = .*$/upload_max_filesize = 50M/g' /etc/php/7.4/apache2/php.ini /etc/php/7.4/cli/php.ini \
&& ln -snf /usr/share/zoneinfo/$TZ /etc/localtime \
&& echo $TZ > /etc/timezone \
&& dpkg-reconfigure tzdata \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment