Fix : Dockerfile config + oscar.ini

dockerize/install.sh

@@ -66,5 +66,9 @@ for i in $(find $DIR_DEST -type f); do
   sed -i s%£CONTAINER_ADMINER%$CONTAINER_ADMINER%g "$i"
 done
 
-docker-compose build -f "$DIR_DEST"/docker-compose.yml
+echo "# For Build / Run"
+echo "cd $DIR_DEST"
+echo "docker-compose build"
+echo "docker-compose up"
+
 

dockerize/skeleton/gearman/Dockerfile

@@ -12,7 +12,7 @@ LABEL authors="Herve Marie <herve.marie@unicaen.fr> Stéphane Bouvry <stephane.b
 LABEL description="Gearman for Oscar"
 
 #ACTIVER OU DESACTIVER PROXY
-RUN if [ "$proxy_environnement" != "noProxy" ]; \
+RUN if [ "$proxy_environnement" != "" ]; \
     then echo "Acquire::http::proxy \"$proxy_environnement\";" > /etc/apt/apt.conf.d/proxy; \
     fi
 

dockerize/skeleton/oscar/Dockerfile

@@ -100,7 +100,7 @@ RUN ln -sf /usr/local/instantclient_18_5 /usr/local/instantclient && \
 
 
 RUN if [ "$proxy_environnement" != "" ]; \
-    then pear config-set http_proxy "£PROXY" \
+    then pear config-set http_proxy "£PROXY"; \
     fi
 
 RUN echo 'instantclient,/usr/local/instantclient' | pecl install oci8-2.2.0
@@ -121,6 +121,7 @@ RUN apt-get autoremove -y && apt-get clean && rm -rf /tmp/* /var/tmp/*
 
 #CONFIG APACHE2
 #RUN rm /etc/apache2/site-available/000-default.conf /etc/apache2/site-available/default-ssl.conf
+COPY etc/php/7.4/99-oscar.ini /etc/php/7.4/99-oscar.ini
 COPY etc/apache2/sites-available/oscar.conf /etc/apache2/sites-available/oscar.conf
 RUN a2dissite 000-default && a2dissite default-ssl && a2ensite oscar
 

dockerize/skeleton/postgresql/Dockerfile

@@ -6,7 +6,7 @@ LABEL Herve Marie <herve.marie@unicaen.fr> Stéphane Bouvry <stephane.bouvry@uni
 LABEL description="Postgresql for Oscar"
 
 #ACTIVATE OR DESACTIVATE PROXY
-RUN if [ "$proxy_environnement" != "noProxy" ]; \
+RUN if [ "$proxy_environnement" != "" ]; \
     then echo "Acquire::http::proxy \"$proxy_environnement\";" > /etc/apt/apt.conf.d/proxy; \
     fi