Commit 689a4270 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

wip php 8.2

parent 249febd1

Dockerfile

+22 −22
Original line number Diff line number Diff line
@@ -201,26 +201,26 @@ CMD ["/sbin/entrypoint.sh"] 


WORKDIR /app



# Dépendances PHP puis sources puis autoloading puis scripts (favorise la mise en cache Docker)

COPY composer.json ./

COPY composer.lock ./

RUN composer install --no-interaction --prefer-dist --optimize-autoloader --no-scripts

COPY . /app

RUN composer dump-autoload --optimize

RUN composer run-script post-install-cmd



# Répertoire pour l'upload de fichiers

RUN mkdir -p upload && \

  chown -R www-data:root upload && \

  chmod -R 770 upload



# Cache Laminas

RUN mkdir -p data/cache && chmod 777 data/cache

RUN rm -rf data/cache/*



# Cache Doctrine

RUN mkdir -p data/DoctrineModule/cache && chmod 777 data/DoctrineModule/cache #&& rm -rf data/DoctrineModule/cache/*

RUN mkdir -p data/DoctrineORMModule/Proxy && chmod 777 data/DoctrineORMModule/Proxy && rm -rf data/DoctrineORMModule/Proxy/*



RUN vendor/bin/laminas-development-mode enable  # nécessaire !

## Dépendances PHP puis sources puis autoloading puis scripts (favorise la mise en cache Docker)

#COPY composer.json ./

#COPY composer.lock ./

#RUN composer install --no-interaction --prefer-dist --optimize-autoloader --no-scripts

#COPY . /app

#RUN composer dump-autoload --optimize

#RUN composer run-script post-install-cmd

#

## Répertoire pour l'upload de fichiers

#RUN mkdir -p upload && \

#  chown -R www-data:root upload && \

#  chmod -R 770 upload

#

## Cache Laminas

#RUN mkdir -p data/cache && chmod 777 data/cache

#RUN rm -rf data/cache/*

#

## Cache Doctrine

#RUN mkdir -p data/DoctrineModule/cache && chmod 777 data/DoctrineModule/cache #&& rm -rf data/DoctrineModule/cache/*

#RUN mkdir -p data/DoctrineORMModule/Proxy && chmod 777 data/DoctrineORMModule/Proxy && rm -rf data/DoctrineORMModule/Proxy/*

#

#RUN vendor/bin/laminas-development-mode enable  # nécessaire !

composer.json

+3 −10
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
    ],

    "require-dev": {

        "laminas-api-tools/api-tools-asset-manager": "^1.5",

        "laminas/laminas-dependency-plugin": "^2.1",

        "laminas/laminas-developer-tools": "^2.3",

        "laminas/laminas-development-mode": "^3.2",

        "phpcompatibility/php-compatibility": "*",
@@ -27,7 +26,7 @@ 
        "unicaen/test": "^6.0"

    },

    "require": {

        "php": "^8.0",

        "php": "^8.2",



        "ext-curl": "*",

        "ext-dom": "*",
@@ -44,11 +43,6 @@ 
        "ext-xsl": "*",

        "ext-zip": "*",



        "laminas-api-tools/api-tools-doctrine": "2.5.x-dev",

        "laminas-api-tools/api-tools-doctrine-querybuilder": "1.10.x-dev",

        "laminas-api-tools/api-tools-documentation": "^1.2",

        "laminas-api-tools/api-tools-documentation-swagger": "^1.2",



        "aws/aws-sdk-php": "^3.226",

        "beberlei/assert": "^3.0",

        "guzzlehttp/guzzle": "^6.3 || ^7.0",
@@ -65,7 +59,7 @@ 
        "unicaen/authentification": "^6.4",

        "unicaen/console": "^6.0",

        "unicaen/db-anonym": "^4.0",

        "unicaen/db-import": "^7.0",

        "unicaen/db-import": "dev-release_7.2.0",

        "unicaen/etat": "^6.0",

        "unicaen/faq": "^7.0",

        "unicaen/idref": "^2.0",
@@ -127,8 +121,7 @@ 
    },

    "config": {

        "allow-plugins": {

            "laminas-api-tools/api-tools-asset-manager": true,

            "laminas/laminas-dependency-plugin": true

            "laminas-api-tools/api-tools-asset-manager": true

        }

    }

}

composer.lock

+1459 −1635

File changed.

Preview size limit exceeded, changes collapsed.

config/application.config.php

+0 −3
Original line number Diff line number Diff line
@@ -9,11 +9,8 @@ return [ 
        'DoctrineModule',

        'DoctrineORMModule',



        'ApiSkeletons\DoctrineORMHydrationModule',

        'Laminas\ApiTools',

        'Laminas\ApiTools\Provider',

        'Laminas\ApiTools\Doctrine\Server',

        'Laminas\ApiTools\Doctrine\QueryBuilder',

        'Laminas\ApiTools\Documentation',

        'Laminas\ApiTools\Documentation\Swagger',

        'Laminas\ApiTools\ApiProblem',

docker-compose.yml

+2 −2
Original line number Diff line number Diff line
@@ -26,11 +26,11 @@ x-minio-common: &minio-common 


services:

  sygal:

#    image: registre.unicaen.fr:5000/sygal-image-php8.0

#    image: registre.unicaen.fr:5000/sygal-image-php8.2

    build:

      context: .

      args:

        - PHP_VERSION=8.0

        - PHP_VERSION=8.2

    environment:

      - http_proxy

      - https_proxy