Commit 97604a27 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Ajout de la spécification du proxy éventuel dans la config wget. Suppression... 

Ajout de la spécification du proxy éventuel dans la config wget. Suppression du test pour la config apt. Ajout de la variable d'env HTTP_PROXY en plus!
parent 0e921429

Dockerfile

+5 −5
Original line number Diff line number Diff line
@@ -14,18 +14,18 @@ ARG HTTP_PROXY 


ENV PHP_VERSION=${PHP_VERSION} \

    APACHE_CONF_DIR=/etc/apache2 \

    PHP_CONF_DIR=/etc/php/${PHP_VERSION}

    PHP_CONF_DIR=/etc/php/${PHP_VERSION} \

    HTTP_PROXY=${HTTP_PROXY}



# On configure le proxy HTTP pour APT

RUN if [ "x${HTTP_PROXY}" != "x" ] ; then \

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

; fi

# Proxy éventuel pour APT

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



# Mise à niveau de la distrib

RUN apt-get -qq update



# PHP 7.x PPA repository

RUN apt-get install -y wget lsb-release apt-transport-https ca-certificates

RUN echo "http_proxy = ${HTTP_PROXY}" >> /etc/wgetrc

RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg

RUN echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" | tee /etc/apt/sources.list.d/php.list

Dockerfile.sh

+4 −4
Original line number Diff line number Diff line
@@ -21,17 +21,17 @@ EOF 
export PHP_VERSION="$1"

export APACHE_CONF_DIR=/etc/apache2

export PHP_CONF_DIR=/etc/php/${PHP_VERSION}

export HTTP_PROXY=${HTTP_PROXY}



# On configure le proxy HTTP pour APT

if [[ "x${HTTP_PROXY}" != "x" ]] ; then \

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

; fi

# Proxy éventuel pour APT

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



# Mise à niveau de la distrib

apt-get -qq update



# PHP 7.x PPA repository

apt-get install -y wget lsb-release apt-transport-https ca-certificates

echo "http_proxy = ${HTTP_PROXY}" >> /etc/wgetrc

wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg

echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" | tee /etc/apt/sources.list.d/php.list