Compare commits
3 Commits
0c69082f0e
...
develop
Author | SHA1 | Date | |
---|---|---|---|
5f2654c3c4 | |||
2e5e1e72ae | |||
746ca35b69 |
2
Jenkinsfile
vendored
2
Jenkinsfile
vendored
@ -4,7 +4,7 @@
|
||||
// Utilisation du pipeline partagé pour les applications Symfony de Cadoles
|
||||
// Le nom de l'image Docker passée en paramètre vous permet de préciser l'environnement de test
|
||||
// de votre application Symfony
|
||||
symfonyAppPipeline('ubuntu:22.04', [
|
||||
symfonyAppPipeline('ubuntu:25.04', [
|
||||
'hooks': [
|
||||
// Run docker image build, verification and publication stages
|
||||
'postSymfonyAppPipeline': {
|
||||
|
@ -26,7 +26,6 @@
|
||||
"symfony/translation": "6.4.*",
|
||||
"symfony/twig-bundle": "6.4.*",
|
||||
"symfony/validator": "6.4.*",
|
||||
"symfony/web-profiler-bundle": "6.4.*",
|
||||
"symfony/webpack-encore-bundle": "^1.16",
|
||||
"symfony/yaml": "6.4.*"
|
||||
},
|
||||
@ -81,6 +80,7 @@
|
||||
},
|
||||
"require-dev": {
|
||||
"rector/rector": "^2.1",
|
||||
"symfony/debug-bundle": "6.4.*"
|
||||
"symfony/debug-bundle": "6.4.*",
|
||||
"symfony/web-profiler-bundle": "6.4.*"
|
||||
}
|
||||
}
|
||||
|
12
composer.lock
generated
12
composer.lock
generated
@ -6206,16 +6206,16 @@
|
||||
},
|
||||
{
|
||||
"name": "rector/rector",
|
||||
"version": "2.1.0",
|
||||
"version": "2.1.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/rectorphp/rector.git",
|
||||
"reference": "d513dea45a94394b660e15c155d1fa27826f8e30"
|
||||
"reference": "d0917c069bb0d9bb06ed111cf052510f609015a4"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/rectorphp/rector/zipball/d513dea45a94394b660e15c155d1fa27826f8e30",
|
||||
"reference": "d513dea45a94394b660e15c155d1fa27826f8e30",
|
||||
"url": "https://api.github.com/repos/rectorphp/rector/zipball/d0917c069bb0d9bb06ed111cf052510f609015a4",
|
||||
"reference": "d0917c069bb0d9bb06ed111cf052510f609015a4",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -6254,7 +6254,7 @@
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/rectorphp/rector/issues",
|
||||
"source": "https://github.com/rectorphp/rector/tree/2.1.0"
|
||||
"source": "https://github.com/rectorphp/rector/tree/2.1.1"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@ -6262,7 +6262,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
],
|
||||
"time": "2025-06-24T20:26:57+00:00"
|
||||
"time": "2025-07-10T11:31:31+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/debug-bundle",
|
||||
|
@ -8,7 +8,7 @@
|
||||
# Using SetHandler avoids issues with using ProxyPassMatch in combination
|
||||
# with mod_rewrite or mod_autoindex
|
||||
<FilesMatch \.php$>
|
||||
SetHandler "proxy:unix:/run/php/php8.1-fpm.sock|fcgi://127.0.0.1:9000"
|
||||
SetHandler "proxy:unix:/run/php/php8.4-fpm.sock|fcgi://127.0.0.1:9000"
|
||||
# for Unix sockets, Apache 2.4.10 or higher
|
||||
# SetHandler proxy:unix:/path/to/fpm.sock|fcgi://dummy
|
||||
</FilesMatch>
|
||||
|
@ -7,7 +7,7 @@ ARG https_proxy=
|
||||
|
||||
ENV WAITFORIT_VERSION="v2.4.1"
|
||||
|
||||
ARG PHP_VERSION="8.1"
|
||||
ARG PHP_VERSION="8.4"
|
||||
ENV PHP_VERSION $PHP_VERSION
|
||||
|
||||
RUN export DEBIAN_FRONTEND=noninteractive && \
|
||||
@ -68,14 +68,14 @@ RUN chmod +x /var/www/install-composer.sh &&\
|
||||
# On active les mods d'apache nécessaires
|
||||
RUN a2enmod rewrite
|
||||
RUN a2enmod proxy_fcgi setenvif
|
||||
RUN a2enconf php8.1-fpm
|
||||
RUN a2enconf php8.4-fpm
|
||||
RUN a2enmod proxy
|
||||
RUN a2enmod expires
|
||||
RUN a2enmod headers
|
||||
|
||||
# On injecte les bonnes configs apache et php-fpm
|
||||
COPY 000-default.conf /etc/apache2/sites-available/000-default.conf
|
||||
COPY www.conf /etc/php/8.1/fpm/pool.d/www.conf
|
||||
COPY www.conf /etc/php/8.4/fpm/pool.d/www.conf
|
||||
|
||||
EXPOSE 5000
|
||||
EXPOSE 80
|
||||
@ -83,8 +83,8 @@ EXPOSE 80
|
||||
WORKDIR /var/www
|
||||
|
||||
# On démarre php-fpm une fois pour créer les sockets
|
||||
RUN service php8.1-fpm start
|
||||
RUN service php8.1-fpm stop
|
||||
RUN service php8.4-fpm start
|
||||
RUN service php8.4-fpm stop
|
||||
|
||||
|
||||
COPY docker-entrypoint.sh /docker-entrypoint.sh
|
||||
@ -99,7 +99,7 @@ RUN sed -i '/imklog/s/^/#/' /etc/rsyslog.conf
|
||||
|
||||
COPY rsyslog.conf /etc/rsyslog.d/var/www.conf
|
||||
COPY supervisor.ini /etc/supervisor/supervisor.ini
|
||||
COPY php.ini /etc/php/8.1/fpm/php.ini
|
||||
COPY php.ini /etc/php/8.4/fpm/php.ini
|
||||
|
||||
VOLUME /container-lifecycle
|
||||
|
||||
|
@ -26,7 +26,7 @@ stderr_logfile_maxbytes=0
|
||||
|
||||
[program:php-fpm]
|
||||
environment=HOSTNAME="%(ENV_HOSTNAME)s"
|
||||
command = /usr/sbin/php-fpm8.1 -F
|
||||
command = /usr/sbin/php-fpm8.4 -F
|
||||
autostart = true
|
||||
autorestart = true
|
||||
directory = /var/www
|
||||
|
@ -6,7 +6,7 @@ error_log=/dev/stderr
|
||||
user = www-data
|
||||
group = www-data
|
||||
|
||||
listen = /run/php/php8.1-fpm.sock
|
||||
listen = /run/php/php8.4-fpm.sock
|
||||
|
||||
listen.owner = www-data
|
||||
listen.group = www-data
|
||||
|
@ -3,6 +3,7 @@
|
||||
declare(strict_types=1);
|
||||
|
||||
use Rector\Config\RectorConfig;
|
||||
use Rector\Renaming\Rector\Class_\RenameAttributeRector;
|
||||
use Rector\Symfony\Set\SymfonySetList;
|
||||
|
||||
return static function (RectorConfig $rectorConfig): void {
|
||||
@ -15,7 +16,13 @@ return static function (RectorConfig $rectorConfig): void {
|
||||
SymfonySetList::SYMFONY_61,
|
||||
SymfonySetList::SYMFONY_62,
|
||||
SymfonySetList::SYMFONY_63,
|
||||
SymfonySetList::SYMFONY_64,
|
||||
SymfonySetList::SYMFONY_CODE_QUALITY,
|
||||
SymfonySetList::SYMFONY_CONSTRUCTOR_INJECTION,
|
||||
]);
|
||||
|
||||
$rectorConfig->importShortClasses(false);
|
||||
$rectorConfig->skip([
|
||||
RenameAttributeRector::class
|
||||
]);
|
||||
};
|
Reference in New Issue
Block a user