From 6a2e879dc427262fc75c3f7aea4b609d93b43dae Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Wed, 12 Feb 2025 12:06:01 +0400 Subject: [PATCH] maj dist --- .composer.lock.runphp | 269 ++++++++++++++++++++++++--- .runphp.conf | 2 +- dockerfiles/Dockerfile.adminer | 2 +- dockerfiles/Dockerfile.adminer+ic | 2 +- dockerfiles/Dockerfile.mariadb10 | 2 +- dockerfiles/Dockerfile.php-apache | 2 +- dockerfiles/Dockerfile.php-apache+ic | 2 +- dockerfiles/Dockerfile.php-cli | 2 +- dockerfiles/Dockerfile.php-cli+ic | 2 +- dockerfiles/Dockerfile.postgres15 | 3 +- runphp/Dockerfile.runphp | 2 +- runphp/Dockerfile.runphp+ic | 2 +- runphp/dot-build.env.dist | 2 +- runphp/dot-dkbuild.env.dist | 20 +- runphp/dot-runphp.conf | 2 +- runphp/runphp | 2 +- runphp/runphp.2postamble | 2 +- 17 files changed, 264 insertions(+), 56 deletions(-) diff --git a/.composer.lock.runphp b/.composer.lock.runphp index bf3295e..04bbdc9 100644 --- a/.composer.lock.runphp +++ b/.composer.lock.runphp @@ -4,8 +4,230 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "356c1dcfe9eee39e9e6eadff4f63cdfe", - "packages": [], + "content-hash": "ab280aa4a5f5c83fa488537530b29759", + "packages": [ + { + "name": "symfony/deprecation-contracts", + "version": "v2.5.4", + "source": { + "type": "git", + "url": "https://github.com/symfony/deprecation-contracts.git", + "reference": "605389f2a7e5625f273b53960dc46aeaf9c62918" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/605389f2a7e5625f273b53960dc46aeaf9c62918", + "reference": "605389f2a7e5625f273b53960dc46aeaf9c62918", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "type": "library", + "extra": { + "thanks": { + "url": "https://github.com/symfony/contracts", + "name": "symfony/contracts" + }, + "branch-alias": { + "dev-main": "2.5-dev" + } + }, + "autoload": { + "files": [ + "function.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "A generic function and convention to trigger deprecation notices", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.4" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-09-25T14:11:13+00:00" + }, + { + "name": "symfony/polyfill-ctype", + "version": "v1.31.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-ctype.git", + "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638", + "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638", + "shasum": "" + }, + "require": { + "php": ">=7.2" + }, + "provide": { + "ext-ctype": "*" + }, + "suggest": { + "ext-ctype": "For best performance" + }, + "type": "library", + "extra": { + "thanks": { + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Ctype\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Gert de Pagter", + "email": "BackEndTea@gmail.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for ctype functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "ctype", + "polyfill", + "portable" + ], + "support": { + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.31.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-09-09T11:45:10+00:00" + }, + { + "name": "symfony/yaml", + "version": "v5.4.45", + "source": { + "type": "git", + "url": "https://github.com/symfony/yaml.git", + "reference": "a454d47278cc16a5db371fe73ae66a78a633371e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/yaml/zipball/a454d47278cc16a5db371fe73ae66a78a633371e", + "reference": "a454d47278cc16a5db371fe73ae66a78a633371e", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1|^3", + "symfony/polyfill-ctype": "^1.8" + }, + "conflict": { + "symfony/console": "<5.3" + }, + "require-dev": { + "symfony/console": "^5.3|^6.0" + }, + "suggest": { + "symfony/console": "For validating YAML files using the lint command" + }, + "bin": [ + "Resources/bin/yaml-lint" + ], + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Yaml\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Loads and dumps YAML files", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/yaml/tree/v5.4.45" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-09-25T14:11:13+00:00" + } + ], "packages-dev": [ { "name": "doctrine/instantiator", @@ -79,16 +301,16 @@ }, { "name": "myclabs/deep-copy", - "version": "1.12.0", + "version": "1.12.1", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c" + "reference": "123267b2c49fbf30d78a7b2d333f6be754b94845" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c", - "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/123267b2c49fbf30d78a7b2d333f6be754b94845", + "reference": "123267b2c49fbf30d78a7b2d333f6be754b94845", "shasum": "" }, "require": { @@ -127,7 +349,7 @@ ], "support": { "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.12.0" + "source": "https://github.com/myclabs/DeepCopy/tree/1.12.1" }, "funding": [ { @@ -135,20 +357,20 @@ "type": "tidelift" } ], - "time": "2024-06-12T14:39:25+00:00" + "time": "2024-11-08T17:47:46+00:00" }, { "name": "nikic/php-parser", - "version": "v5.3.1", + "version": "v5.4.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b" + "reference": "447a020a1f875a434d62f2a401f53b82a396e494" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8eea230464783aa9671db8eea6f8c6ac5285794b", - "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/447a020a1f875a434d62f2a401f53b82a396e494", + "reference": "447a020a1f875a434d62f2a401f53b82a396e494", "shasum": "" }, "require": { @@ -191,9 +413,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.1" + "source": "https://github.com/nikic/PHP-Parser/tree/v5.4.0" }, - "time": "2024-10-08T18:51:32+00:00" + "time": "2024-12-30T11:07:19+00:00" }, { "name": "nulib/tests", @@ -201,7 +423,7 @@ "source": { "type": "git", "url": "https://git.univ-reunion.fr/sda-php/nulib-tests.git", - "reference": "6ce8257560b42e8fb3eea03eba84d3877c9648ca" + "reference": "9b5c9c295c3dee6fc02ccddbd8a70bca797c8045" }, "require": { "php": ">=7.3", @@ -225,7 +447,7 @@ } ], "description": "fonctions et classes pour les tests", - "time": "2024-03-26T10:56:17+00:00" + "time": "2025-01-30T13:18:31+00:00" }, { "name": "phar-io/manifest", @@ -666,16 +888,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.21", + "version": "9.6.22", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "de6abf3b6f8dd955fac3caad3af7a9504e8c2ffa" + "reference": "f80235cb4d3caa59ae09be3adf1ded27521d1a9c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/de6abf3b6f8dd955fac3caad3af7a9504e8c2ffa", - "reference": "de6abf3b6f8dd955fac3caad3af7a9504e8c2ffa", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f80235cb4d3caa59ae09be3adf1ded27521d1a9c", + "reference": "f80235cb4d3caa59ae09be3adf1ded27521d1a9c", "shasum": "" }, "require": { @@ -686,7 +908,7 @@ "ext-mbstring": "*", "ext-xml": "*", "ext-xmlwriter": "*", - "myclabs/deep-copy": "^1.12.0", + "myclabs/deep-copy": "^1.12.1", "phar-io/manifest": "^2.0.4", "phar-io/version": "^3.2.1", "php": ">=7.3", @@ -749,7 +971,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.21" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.22" }, "funding": [ { @@ -765,7 +987,7 @@ "type": "tidelift" } ], - "time": "2024-09-19T10:50:18+00:00" + "time": "2024-12-05T13:48:26+00:00" }, { "name": "sebastian/cli-parser", @@ -1787,6 +2009,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { + "ext-json": "*", "php": "^7.4" }, "platform-dev": { diff --git a/.runphp.conf b/.runphp.conf index 89af070..75c5696 100644 --- a/.runphp.conf +++ b/.runphp.conf @@ -5,4 +5,4 @@ RUNPHP= # Si RUNPHP n'est pas défini, les variables suivantes peuvent être définies DIST=d11 -#REGISTRY=pubdocker.univ-reunion.fr +#REGISTRY=pubdocker.univ-reunion.fr/dist diff --git a/dockerfiles/Dockerfile.adminer b/dockerfiles/Dockerfile.adminer index 96df10b..688f199 100644 --- a/dockerfiles/Dockerfile.adminer +++ b/dockerfiles/Dockerfile.adminer @@ -1,6 +1,6 @@ # -*- coding: utf-8 mode: dockerfile -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 ARG NDIST=12 -ARG REGISTRY=pubdocker.univ-reunion.fr +ARG REGISTRY=pubdocker.univ-reunion.fr/dist FROM $REGISTRY/src/base AS base FROM $REGISTRY/src/php AS php diff --git a/dockerfiles/Dockerfile.adminer+ic b/dockerfiles/Dockerfile.adminer+ic index 609ee69..13d4fe0 100644 --- a/dockerfiles/Dockerfile.adminer+ic +++ b/dockerfiles/Dockerfile.adminer+ic @@ -1,6 +1,6 @@ # -*- coding: utf-8 mode: dockerfile -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 ARG NDIST=12 -ARG REGISTRY=pubdocker.univ-reunion.fr +ARG REGISTRY=pubdocker.univ-reunion.fr/dist FROM $REGISTRY/src/base AS base FROM $REGISTRY/src/instantclient AS instantclient diff --git a/dockerfiles/Dockerfile.mariadb10 b/dockerfiles/Dockerfile.mariadb10 index f26efd5..f77d113 100644 --- a/dockerfiles/Dockerfile.mariadb10 +++ b/dockerfiles/Dockerfile.mariadb10 @@ -1,5 +1,5 @@ # -*- coding: utf-8 mode: dockerfile -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -ARG REGISTRY=pubdocker.univ-reunion.fr +ARG REGISTRY=pubdocker.univ-reunion.fr/dist FROM $REGISTRY/src/base AS base FROM $REGISTRY/src/mariadb AS mariadb FROM $REGISTRY/src/legacytools AS legacytools diff --git a/dockerfiles/Dockerfile.php-apache b/dockerfiles/Dockerfile.php-apache index 3d5adf4..2a9e467 100644 --- a/dockerfiles/Dockerfile.php-apache +++ b/dockerfiles/Dockerfile.php-apache @@ -1,6 +1,6 @@ # -*- coding: utf-8 mode: dockerfile -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 ARG NDIST=12 -ARG REGISTRY=pubdocker.univ-reunion.fr +ARG REGISTRY=pubdocker.univ-reunion.fr/dist FROM $REGISTRY/src/base AS base FROM $REGISTRY/src/php AS php diff --git a/dockerfiles/Dockerfile.php-apache+ic b/dockerfiles/Dockerfile.php-apache+ic index 9c3cd80..cfbbd61 100644 --- a/dockerfiles/Dockerfile.php-apache+ic +++ b/dockerfiles/Dockerfile.php-apache+ic @@ -1,6 +1,6 @@ # -*- coding: utf-8 mode: dockerfile -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 ARG NDIST=12 -ARG REGISTRY=pubdocker.univ-reunion.fr +ARG REGISTRY=pubdocker.univ-reunion.fr/dist FROM $REGISTRY/src/base AS base FROM $REGISTRY/src/legacytools AS legacytools diff --git a/dockerfiles/Dockerfile.php-cli b/dockerfiles/Dockerfile.php-cli index ef17f83..f6bcfbc 100644 --- a/dockerfiles/Dockerfile.php-cli +++ b/dockerfiles/Dockerfile.php-cli @@ -1,6 +1,6 @@ # -*- coding: utf-8 mode: dockerfile -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 ARG NDIST=12 -ARG REGISTRY=pubdocker.univ-reunion.fr +ARG REGISTRY=pubdocker.univ-reunion.fr/dist FROM $REGISTRY/src/base AS base FROM $REGISTRY/src/php AS php diff --git a/dockerfiles/Dockerfile.php-cli+ic b/dockerfiles/Dockerfile.php-cli+ic index b380090..48f376b 100644 --- a/dockerfiles/Dockerfile.php-cli+ic +++ b/dockerfiles/Dockerfile.php-cli+ic @@ -1,6 +1,6 @@ # -*- coding: utf-8 mode: dockerfile -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 ARG NDIST=12 -ARG REGISTRY=pubdocker.univ-reunion.fr +ARG REGISTRY=pubdocker.univ-reunion.fr/dist FROM $REGISTRY/src/base AS base FROM $REGISTRY/src/legacytools AS legacytools diff --git a/dockerfiles/Dockerfile.postgres15 b/dockerfiles/Dockerfile.postgres15 index f9b4db9..4edb5c5 100644 --- a/dockerfiles/Dockerfile.postgres15 +++ b/dockerfiles/Dockerfile.postgres15 @@ -1,5 +1,6 @@ # -*- coding: utf-8 mode: dockerfile -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -ARG REGISTRY=pubdocker.univ-reunion.fr +ARG REGISTRY=pubdocker.univ-reunion.fr/dist + FROM $REGISTRY/src/base AS base FROM $REGISTRY/src/postgres AS postgres diff --git a/runphp/Dockerfile.runphp b/runphp/Dockerfile.runphp index ef17f83..f6bcfbc 100644 --- a/runphp/Dockerfile.runphp +++ b/runphp/Dockerfile.runphp @@ -1,6 +1,6 @@ # -*- coding: utf-8 mode: dockerfile -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 ARG NDIST=12 -ARG REGISTRY=pubdocker.univ-reunion.fr +ARG REGISTRY=pubdocker.univ-reunion.fr/dist FROM $REGISTRY/src/base AS base FROM $REGISTRY/src/php AS php diff --git a/runphp/Dockerfile.runphp+ic b/runphp/Dockerfile.runphp+ic index b380090..48f376b 100644 --- a/runphp/Dockerfile.runphp+ic +++ b/runphp/Dockerfile.runphp+ic @@ -1,6 +1,6 @@ # -*- coding: utf-8 mode: dockerfile -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 ARG NDIST=12 -ARG REGISTRY=pubdocker.univ-reunion.fr +ARG REGISTRY=pubdocker.univ-reunion.fr/dist FROM $REGISTRY/src/base AS base FROM $REGISTRY/src/legacytools AS legacytools diff --git a/runphp/dot-build.env.dist b/runphp/dot-build.env.dist index 15f02fd..e8202f8 100644 --- a/runphp/dot-build.env.dist +++ b/runphp/dot-build.env.dist @@ -14,7 +14,7 @@ PRIVAREG= ################################################################################ # Ne pas toucher à partir d'ici -REGISTRY=pubdocker.univ-reunion.fr +REGISTRY=pubdocker.univ-reunion.fr/dist DIST=d12 IMAGENAME=runphp #DEVUSER_USERENT=user:x:1000:1000:User,,,:/home/user:/bin/bash diff --git a/runphp/dot-dkbuild.env.dist b/runphp/dot-dkbuild.env.dist index 06a0348..b3319ea 100644 --- a/runphp/dot-dkbuild.env.dist +++ b/runphp/dot-dkbuild.env.dist @@ -1,5 +1,4 @@ # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -default_profile "${DKBUILD_PROFILE:-prod}" # Source des paquets et proxy setenv APT_PROXY= @@ -9,20 +8,5 @@ setenv SEC_MIRROR=default # Timezone du serveur setenv TIMEZONE=Europe/Paris -if profile prod test; then - setenv REGISTRY=pubdocker.univ-reunion.fr - setenv PRIVAREG=pridocker.univ-reunion.fr - host_mappings=( - pridocker.univ-reunion.fr:10.85.1.56 - pubdocker.univ-reunion.fr:10.85.1.57 - repos.univ-reunion.fr:10.85.1.57 - git.univ-reunion.fr:10.85.1.55 - ) - default docker host-mappings="${host_mappings[*]}" -elif profile devel; then - setenv REGISTRY=docker.devel.self - setenv PRIVAREG=docker.devel.self -else - setenv REGISTRY=pubdocker.univ-reunion.fr - setenv PRIVAREG= -fi +setenv REGISTRY=pubdocker.univ-reunion.fr/dist +setenv PRIVAREG= diff --git a/runphp/dot-runphp.conf b/runphp/dot-runphp.conf index b409a45..0c2f16a 100644 --- a/runphp/dot-runphp.conf +++ b/runphp/dot-runphp.conf @@ -5,4 +5,4 @@ RUNPHP= # Si RUNPHP n'est pas défini, les variables suivantes peuvent être définies #DIST=d12 -#REGISTRY=pubdocker.univ-reunion.fr +#REGISTRY=pubdocker.univ-reunion.fr/dist diff --git a/runphp/runphp b/runphp/runphp index 87691d7..ad4dc8a 100755 --- a/runphp/runphp +++ b/runphp/runphp @@ -259,7 +259,7 @@ if [ "$RUNPHP_MODE" != docker ]; then [ -n "$SEC_MIRROR" ] || SEC_MIRROR=default [ -n "$TIMEZONE" ] || TIMEZONE=Europe/Paris [ -n "$PRIVAREG" ] || PRIVAREG= - [ -n "$REGISTRY" ] || REGISTRY=pubdocker.univ-reunion.fr + [ -n "$REGISTRY" ] || REGISTRY=pubdocker.univ-reunion.fr/dist ## Charger la configuration diff --git a/runphp/runphp.2postamble b/runphp/runphp.2postamble index 83f987b..07c847e 100644 --- a/runphp/runphp.2postamble +++ b/runphp/runphp.2postamble @@ -210,7 +210,7 @@ if [ "$RUNPHP_MODE" != docker ]; then [ -n "$SEC_MIRROR" ] || SEC_MIRROR=default [ -n "$TIMEZONE" ] || TIMEZONE=Europe/Paris [ -n "$PRIVAREG" ] || PRIVAREG= - [ -n "$REGISTRY" ] || REGISTRY=pubdocker.univ-reunion.fr + [ -n "$REGISTRY" ] || REGISTRY=pubdocker.univ-reunion.fr/dist ## Charger la configuration