Commit 8394ae4c authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Merge branch 'fix-proxy' into 'buster' 

Précision du proxy dans la config PEAR et sur la ligne de commande curl

See merge request !6
parents 304c9697 abf193b7

Dockerfile

+2 −1
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ ADD configs/php.conf ${PHP_CONF_DIR}/fpm/conf.d/20-php-unicaen.ini 
ADD configs/php-opcache.ini ${PHP_CONF_DIR}/fpm/conf.d/20-opcache-unicaen.ini



# Package PHP Oracle OCI8

RUN pear config-set http_proxy ${HTTP_PROXY}

ADD resources/instantclient-basiclite-linux.x64-12.2.0.1.0.zip /tmp/

ADD resources/instantclient-sdk-linux.x64-12.2.0.1.0.zip /tmp/

ADD resources/instantclient-sqlplus-linux.x64-12.2.0.1.0.zip /tmp/
@@ -114,7 +115,7 @@ ADD scripts/update-satis.sh /usr/local/bin/update-satis 
RUN chmod 755 /usr/local/bin/update-satis



# Composer

RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer && \

RUN curl -sS https://getcomposer.org/installer --proxy  ${HTTP_PROXY} | php -- --install-dir=/usr/local/bin --filename=composer && \

    composer global require hirak/prestissimo --no-plugins --no-scripts



# Nettoyage