Commit fadd97f1 authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

Maj DOCKER (fix sur Bookworm des containers PHP)

parent 86891178

docker/app_Dockerfile

+12 −3
Original line number Diff line number Diff line 
FROM php:8.2-fpm

FROM php:8.2-fpm-bookworm



LABEL authors="Stéphane BOUVRY<stephane.bouvry@unicaen.fr>"
@@ -26,7 +26,13 @@ RUN apt update && apt install -y \ 
    libpq-dev \

    postgresql-client \

    libgearman-dev \

    gearman-job-server

    gearman-job-server \

    unzip build-essential expect \

    graphviz



# wkhtmltopdf







RUN pecl install gearman  \

    && docker-php-ext-enable gearman \
@@ -70,7 +76,7 @@ RUN wget https://getcomposer.org/download/2.2.24/composer.phar 
RUN mv composer.phar /bin/composer

RUN chmod +x /bin/composer



RUN apt install -y unzip libaio1 build-essential expect

# RUN apt install -y unzip libaio1 build-essential expect



# Driver OCI (Oracle)

COPY resources/instantclient-basiclite-linux.x64-18.5.0.0.0dbru.zip /tmp/
@@ -103,6 +109,9 @@ RUN apt install -y wkhtmltopdf 
RUN curl -fsSL https://deb.nodesource.com/setup_22.x | bash -

RUN apt-get install -y nodejs



#

# RUN apt install



# installation de Yarn (gestionnaire de dépendance node)

RUN npm install --global yarn

WORKDIR /var/application/ui

docker/compose.dev.yml

+34 −34
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
# OSCAR DOCKER (Prod)

########################################################################

networks:

  app-network:

  connor-network:

    driver: bridge



volumes:
@@ -12,8 +12,8 @@ volumes: 
services:

  ######################################################################

  # POSTGRESQL

  app-postgres:

    container_name: app-postgres

  connor-postgres:

    container_name: connor-postgres



    restart: always
@@ -34,7 +34,7 @@ services: 
      no_proxy: ${NO_PROXY}



    networks:

      - app-network

      - connor-network



    env_file:

      - .env
@@ -54,17 +54,17 @@ services: 


  ######################################################################

  ### APACHE

  app-apache:

    container_name: app-apache

  connor-apache:

    container_name: connor-apache

    restart: unless-stopped

    volumes:

      - ./:/var/application



    depends_on:

      - app-php

      - connor-php



    networks:

      - app-network

      - connor-network



    environment:

      http_proxy: ${HTTP_PROXY}
@@ -88,16 +88,16 @@ services: 


  ######################################################################

  ### GEARMAN

  app-gearman:

    container_name: app-gearman

  connor-gearman:

    container_name: connor-gearman

    image: artefactual/gearmand:1.1.21.2-alpine

    depends_on:

      - app-postgres

      - connor-postgres

    environment:

      http_proxy: ${HTTP_PROXY}

      no_proxy: ${NO_PROXY}

    networks:

      - app-network

      - connor-network

    env_file:

      - .env

    tty: true
@@ -106,15 +106,15 @@ services: 


  ######################################################################

  ### ELASTICSEARCH

  app-elasticsearch:

    container_name: app-elasticsearch

  connor-elasticsearch:

    container_name: connor-elasticsearch

    image: elasticsearch:7.17.28

    environment:

      - discovery.type=single-node

      - bootstrap.memory_lock=true

      - "ES_JAVA_OPTS=-Xms${ELASTICSEARCH_MEMORY} -Xmx${ELASTICSEARCH_MEMORY}"

    depends_on:

      app-postgres:

      connor-postgres:

        condition: service_healthy

    ulimits:

      memlock:
@@ -126,7 +126,7 @@ services: 
      - elastic_data:/usr/share/elasticsearch/data

    user: "1000:1000"

    networks:

      - app-network

      - connor-network

    env_file:

      - .env

    tty: true
@@ -135,11 +135,11 @@ services: 


  ######################################################################

  ### APPLICATION (Utilisée par Apache)

  app-php:

    container_name: app-php

  connor-php:

    container_name: connor-php

    restart: unless-stopped

    depends_on:

      - app-worker

      - connor-worker

    volumes:

      - ./:/var/application

      # Dossiers
@@ -166,11 +166,11 @@ services: 
      # Fichiers de configuration (PHP)

      - ${VOLUMES_CONFIG}/php/90-app.ini:/usr/local/etc/php/conf.d/90-app.ini

      # Fichiers (DEVELOPPEMENT UNIQUEMENT)

      #- ./docker/app_99-debug.ini:/usr/local/etc/php/conf.d/99-app-debug.ini

      #- ./docker/app_99-debug.ini:/usr/local/etc/php/conf.d/99-connor-debug.ini

    #    command:

    #      - chmod -R 777 /var/application/data

    networks:

      - app-network

      - connor-network

    env_file:

      - .env

    environment:
@@ -186,11 +186,11 @@ services: 


    ######################################################################

  ### APPLICATION (Utilisée en mode CLI)

  app-worker:

    container_name: app-worker

  connor-worker:

    container_name: connor-worker

    restart: unless-stopped

    depends_on:

      - app-elasticsearch

      - connor-elasticsearch

    volumes:

      - ./:/var/application

      # Dossiers
@@ -210,7 +210,7 @@ services: 
      # Fichiers de configuration (PHP)

      - ${VOLUMES_CONFIG}/php/95-cli.ini:/usr/local/etc/php/conf.d/95-cli.ini

    networks:

      - app-network

      - connor-network

    env_file:

      - .env

    environment:
@@ -226,12 +226,12 @@ services: 


  ######################################################################

  ### VITE

  app-vite:

    container_name: app-vite

  connor-vite:

    container_name: connor-vite

    volumes:

      - ./:/var/application

    networks:

      - app-network

      - connor-network

    build:

      context: ./docker/dev/vite

      dockerfile: Dockerfile
@@ -245,15 +245,15 @@ services: 
  # KIBANA

  kibana:

    image: docker.elastic.co/kibana/kibana:7.16.1

    container_name: app-kibana

    container_name: connor-kibana

    depends_on:

      - app-elasticsearch

      - connor-elasticsearch

    networks:

      - app-network

      - connor-network

    #    deploy:

    #      replicas: ${DEVELOPPEMENT:-0}

    environment:

      - ELASTICSEARCH_HOSTS=http://app-elasticsearch:9200  # Connexion à Elasticsearch

      - ELASTICSEARCH_HOSTS=http://connor-elasticsearch:9200  # Connexion à Elasticsearch

      - LOGGING_ROOT_LEVEL=error

    ports:

      - "5601:5601"
@@ -263,9 +263,9 @@ services: 
  # MAILHOG (capture les mails envoyés depuis Oscar)

  mailhog:

    image: mailhog/mailhog

    container_name: app-mailhog

    container_name: connor-mailhog

    networks:

      - app-network

      - connor-network

    #    deploy:

    #      replicas: ${DEVELOPPEMENT:-0}

    #

docker/compose.prod.yml

+25 −25
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
# OSCAR DOCKER (Prod)

########################################################################

networks:

  app-network:

  connor-network:

    driver: bridge



volumes:
@@ -12,8 +12,8 @@ volumes: 
services:

  ######################################################################

  # POSTGRESQL

  app-postgres:

    container_name: app-postgres

  connor-postgres:

    container_name: connor-postgres



    restart: always
@@ -34,7 +34,7 @@ services: 
      no_proxy: ${NO_PROXY}



    networks:

      - app-network

      - connor-network



    env_file:

      - .env
@@ -54,17 +54,17 @@ services: 


  ######################################################################

  ### APACHE

  app-apache:

    container_name: app-apache

  connor-apache:

    container_name: connor-apache

    restart: unless-stopped

    volumes:

      - ./:/var/application



    depends_on:

      - app-php

      - connor-php



    networks:

      - app-network

      - connor-network



    environment:

      http_proxy: ${HTTP_PROXY}
@@ -88,16 +88,16 @@ services: 


  ######################################################################

  ### GEARMAN

  app-gearman:

    container_name: app-gearman

  connor-gearman:

    container_name: connor-gearman

    image: artefactual/gearmand:1.1.21.2-alpine

    depends_on:

      - app-postgres

      - connor-postgres

    environment:

      http_proxy: ${HTTP_PROXY}

      no_proxy: ${NO_PROXY}

    networks:

      - app-network

      - connor-network

    env_file:

      - .env

    tty: true
@@ -106,15 +106,15 @@ services: 


  ######################################################################

  ### ELASTICSEARCH

  app-elasticsearch:

    container_name: app-elasticsearch

  connor-elasticsearch:

    container_name: connor-elasticsearch

    image: elasticsearch:7.17.28

    environment:

      - discovery.type=single-node

      - bootstrap.memory_lock=true

      - "ES_JAVA_OPTS=-Xms${ELASTICSEARCH_MEMORY} -Xmx${ELASTICSEARCH_MEMORY}"

    depends_on:

      app-postgres:

      connor-postgres:

        condition: service_healthy

    ulimits:

      memlock:
@@ -126,7 +126,7 @@ services: 
      - elastic_data:/usr/share/elasticsearch/data

    user: "1000:1000"

    networks:

      - app-network

      - connor-network

    env_file:

      - .env

    tty: true
@@ -135,11 +135,11 @@ services: 


  ######################################################################

  ### APPLICATION (Utilisée par Apache)

  app-php:

    container_name: app-php

  connor-php:

    container_name: connor-php

    restart: unless-stopped

    depends_on:

      - app-worker

      - connor-worker

    volumes:

      - ./:/var/application

      # Dossiers
@@ -166,11 +166,11 @@ services: 
      # Fichiers de configuration (PHP)

      - ${VOLUMES_CONFIG}/php/90-app.ini:/usr/local/etc/php/conf.d/90-app.ini

      # Fichiers (DEVELOPPEMENT UNIQUEMENT)

      #- ./docker/app_99-debug.ini:/usr/local/etc/php/conf.d/99-app-debug.ini

      #- ./docker/app_99-debug.ini:/usr/local/etc/php/conf.d/99-connor-debug.ini

    #    command:

    #      - chmod -R 777 /var/application/data

    networks:

      - app-network

      - connor-network

    env_file:

      - .env

    environment:
@@ -186,11 +186,11 @@ services: 


    ######################################################################

  ### APPLICATION (Utilisée en mode CLI)

  app-worker:

    container_name: app-worker

  connor-worker:

    container_name: connor-worker

    restart: unless-stopped

    depends_on:

      - app-elasticsearch

      - connor-elasticsearch

    volumes:

      - ./:/var/application

      # Dossiers
@@ -210,7 +210,7 @@ services: 
      # Fichiers de configuration (PHP)

      - ${VOLUMES_CONFIG}/php/95-cli.ini:/usr/local/etc/php/conf.d/95-cli.ini

    networks:

      - app-network

      - connor-network

    env_file:

      - .env

    environment:

module/Oscar/src/Oscar/Service/ProjectGrantService.php

+12 −3
Original line number Diff line number Diff line
@@ -2669,9 +2669,18 @@ class ProjectGrantService implements UseGearmanJobLauncherService, UseOscarConfi 
                    case 'orp':

                        if ($modeProject) {

                            $filterNotES[] = [

                                ["exists" => [

                                    "field" => "activities"

                                ]]

                                [

                                    "nested" => [

                                        "path" => "activities",

                                        "query" => [

                                            "bool" => [

                                                " " => [



                                                ]

                                            ]

                                        ]

                                    ]

                                ]

                            ];

                        } else {

                            $filterNotES[] = [

ui/src/custom-variables.scss

0 → 100644
+7 −0
Original line number Diff line number Diff line 
$brand-secondary1: #a41f81;

$brand-secondary2: #47929e;

$brand-success: #5cb85c !default;

$brand-info: #5bc0de !default;

$brand-warning: #f0ad4e !default;

$brand-danger: #d9534f !default;

$brand-error: #cb0b05 !default;
 
 No newline at end of file