Commit 1fb8f6db authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

UP : Ajout de la configuration par défaut OSCAR + droits d'accès en écriture pour les logs/config

parent 872b55a3

dockerize/skeleton/elasticsearch/Dockerfile

+5 −0
Original line number Diff line number Diff line 
FROM docker.elastic.co/elasticsearch/elasticsearch:7.16.1



# Issue du docker-compose

ARG proxy_environnement

ARG service_oscar_name

ARG service_gearman_name

ARG service_elasticsearch_name



RUN if [ "$proxy_environnement" != "" ]; \

    then echo "Acquire::http::proxy \"$proxy_environnement\";" > /etc/apt/apt.conf.d/proxy; \

    fi



#NO PROXY POUR LES CONTAINERS ENTRE EUX

ENV no_proxy=${service_oscar_name},${service_gearman_name},${service_elasticsearch_name}

dockerize/skeleton/oscar/Dockerfile

+6 −0
Original line number Diff line number Diff line
@@ -141,6 +141,12 @@ RUN echo "UPDATE" 
COPY startup.sh /opt/startup.sh

RUN chmod +x /opt/startup.sh



# OSCAR CONFIG (default)

RUN mkdir /etc/oscar_config/

COPY oscar/config/autoload/local.php /opt/oscar_config/local.php

COPY oscar/config/autoload/unicaen-app.local.php /opt/oscar_config/unicaen-app.local.php

COPY oscar/config/autoload/unicaen-auth.local.php /opt/oscar_config/unicaen-auth.local.php



#SUPERVISOR FICHIERS DE CONFIG POUR MULTIPLES SERVICES IN CONTAINER DOCKER

COPY supervisor /etc/supervisor/conf.d/oscar.conf

EXPOSE 80 9000 9003

dockerize/skeleton/oscar/startup.sh

+10 −1
Original line number Diff line number Diff line
@@ -7,6 +7,15 @@ composer install 
# PATH Access

chmod -R 777 data/DoctrineORMModule



touch config/autoload/oscar-editable.yml

touch logs/oscar.log

chmod 777 config/autoload/oscar-editable.yml

chmod 777 logs/oscar.log



cp -R -u -p /opt/oscar_config/local.php config/autoload/local.php

cp -R -u -p /opt/oscar_config/unicaen-app.local.php config/autoload/unicaen-app.local.php

cp -R -u -p /opt/oscar_config/unicaen-auth.local.php config/autoload/unicaen-auth.local.php



# On attends que Postgresql soit UP

until PGPASSWORD="azerty" psql -h "£CONTAINER_POSTGRESQL" -U "oscar" "oscar_dev" -c '\q'; do

  echo "Postgres is unavailable - sleeping"