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

Merge branch 'connor' into connor-dev

parents ba497be2 4fdd11cb

docker/.env.dev.dist

+6 −6
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ APP_ADMINISTRATORS=stephane.bouvry@unicaen.fr 
# Exemple avec : PROXY=http://proxy.unicaen.fr:3128

# Exemple sans : PROXY=

HTTP_PROXY=

NO_PROXY=no_proxy=localhost,*.unicaen.fr,127.0.0.1,kusanagi-progresql,kusanagi-elasticsearch,kusanagi-gearman,kusanagi-apache,kusanagi-php,kusanagi-worker,kusanagi-vite

NO_PROXY=localhost,*.unicaen.fr,127.0.0.1,connor-progresql,connor-elasticsearch,connor-gearman,connor-apache,connor-php,connor-worker,connor-vite



# ----------------------------------------------------------------------------

# MAILS ----------------------------------------------------------------------
@@ -28,7 +28,7 @@ MAILER_TYPE="smtp" 
# -- Host

#MAILER_CMD="/usr/sbin/sendmail -bs"

MAILER_CMD=

MAILER_HOST="kusanagi-mailhog"

MAILER_HOST="connor-mailhog"

MAILER_PORT=1025

MAILER_USERNAME=""

MAILER_PASSWORD=""
@@ -80,7 +80,7 @@ VOLUMES_TIMESHEET_SPENT_ACTIVITY=${VOLUMES_TEMPLATES}/estimated_spent_activity_. 
# ----------------------------------------------------------------------------

## POSTGRESQL ----------------------------------------------------------------

# Cas 1 : Postgresql dans un container

POSGRESQL=kusanagi-postgres

POSGRESQL=connor-postgres

POSGRESQL_USER=oscar_dev_user

POSGRESQL_PASS=oscar_dev_pass

POSGRESQL_BASE=oscar_dev_db
@@ -156,7 +156,7 @@ ENV_MODE=prod 




# PHP FPM  -------------------------------------------------------------------

PHP_HOST=kusanagi-php

PHP_HOST=connor-php
@@ -171,12 +171,12 @@ VITE_BASE_URL_DEV="http://localhost:5173" 
VITE_BASE_URL_PROD="/js/oscar/vite/dist"



# Gearman --------------------------------------------------------------------

GEARMAN_HOST=kusanagi-gearman

GEARMAN_HOST=connor-gearman

GEARMAN_PORT=4730

GEARMAN_ADDR=${GEARMAN_HOST}:${GEARMAN_PORT}



# Elasticsearch --------------------------------------------------------------

ELASTICSEARCH_HOST=kusanagi-elasticsearch

ELASTICSEARCH_HOST=connor-elasticsearch

ELASTICSEARCH_PORT=9200

ELASTICSEARCH_ADDR=${ELASTICSEARCH_HOST}:${ELASTICSEARCH_PORT}

ELASTICSEARCH_MEMORY=1g

docker/.env.prod.dist

+6 −6
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ APP_ADMINISTRATORS=admin.oscar@your-domain.ext 
# Exemple avec : PROXY=http://proxy.your-domain.ext:3128

# Exemple sans : PROXY=

HTTP_PROXY=

NO_PROXY=no_proxy=localhost,*.your-domain.ext,127.0.0.1,kusanagi-progresql,kusanagi-elasticsearch,kusanagi-gearman,kusanagi-apache,kusanagi-php,kusanagi-worker,kusanagi-vite

NO_PROXY=localhost,*.your-domain.ext,127.0.0.1,connor-progresql,connor-elasticsearch,connor-gearman,connor-apache,connor-php,connor-worker,connor-vite



# ----------------------------------------------------------------------------

# MAILS ----------------------------------------------------------------------
@@ -28,7 +28,7 @@ MAILER_TYPE="smtp" 
# -- Host

#MAILER_CMD="/usr/sbin/sendmail -bs"

MAILER_CMD=

MAILER_HOST="kusanagi-mailhog"

MAILER_HOST="connor-mailhog"

MAILER_PORT=1025

MAILER_USERNAME=""

MAILER_PASSWORD=""
@@ -80,7 +80,7 @@ VOLUMES_TIMESHEET_SPENT_ACTIVITY=${VOLUMES_TEMPLATES}/estimated_spent_activity_. 
# ----------------------------------------------------------------------------

## POSTGRESQL ----------------------------------------------------------------

# Cas 1 : Postgresql dans un container

POSGRESQL=kusanagi-postgres

POSGRESQL=connor-postgres

POSGRESQL_USER=oscar_dev_user

POSGRESQL_PASS=oscar_dev_pass

POSGRESQL_BASE=oscar_dev_db
@@ -156,7 +156,7 @@ ENV_MODE=prod 




# PHP FPM  -------------------------------------------------------------------

PHP_HOST=kusanagi-php

PHP_HOST=connor-php
@@ -171,12 +171,12 @@ VITE_BASE_URL_DEV="http://localhost:5173" 
VITE_BASE_URL_PROD="/js/oscar/vite/dist"



# Gearman --------------------------------------------------------------------

GEARMAN_HOST=kusanagi-gearman

GEARMAN_HOST=connor-gearman

GEARMAN_PORT=4730

GEARMAN_ADDR=${GEARMAN_HOST}:${GEARMAN_PORT}



# Elasticsearch --------------------------------------------------------------

ELASTICSEARCH_HOST=kusanagi-elasticsearch

ELASTICSEARCH_HOST=connor-elasticsearch

ELASTICSEARCH_PORT=9200

ELASTICSEARCH_ADDR=${ELASTICSEARCH_HOST}:${ELASTICSEARCH_PORT}

ELASTICSEARCH_MEMORY=1g

docker/apache_Dockerfile

+6 −0
Original line number Diff line number Diff line
@@ -10,6 +10,12 @@ ENV http_proxy=${HTTP_PROXY} 
ENV HTTPS_PROXY=${HTTP_PROXY}

ENV https_proxy=${HTTP_PROXY}



# Configurer APT pour utiliser le proxy

RUN if [ -n "$HTTP_PROXY" ]; then \

        echo "Acquire::http::Proxy \"${HTTP_PROXY}\";" > /etc/apt/apt.conf.d/01proxy && \

        echo "Acquire::https::Proxy \"${HTTP_PROXY}\";" >> /etc/apt/apt.conf.d/01proxy; \

    fi



RUN apt update && apt install -y apache2



RUN a2enmod proxy_fcgi setenvif rewrite

docker/app_Dockerfile

+2 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ RUN apt update && apt install -y \ 
    unzip build-essential expect \

    graphviz





# wkhtmltopdf
@@ -76,7 +77,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-get update && apt-get install -y libaio1 libnsl2



# Driver OCI (Oracle)

COPY resources/instantclient-basiclite-linux.x64-18.5.0.0.0dbru.zip /tmp/

module/Oscar/src/Oscar/Controller/ProjectGrantController.php

+0 −2
Original line number Diff line number Diff line
@@ -1550,8 +1550,6 @@ class ProjectGrantController extends AbstractOscarController implements UseNotif 
                    'contract/show',

                    ['id' => $projectGrant->getId()]

                );

            } else {

                die("INVALID");

            }

        }