Commit 5c55be69 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Correction des Dockerfile pour forcer l'install de composer v1 (car la v2 génère des problèmes)

parent b602d0c2

Dockerfile-5.x

+3 −2
Original line number Diff line number Diff line
@@ -119,8 +119,9 @@ ADD configs/apache/security.conf ${APACHE_CONF_DIR}/conf-available/security-unic 
RUN a2disconf security.conf && \

    a2enconf security-unicaen.conf php${PHP_VERSION}-fpm



# Composer 2.x (plus besoin de hirak/prestissimo depuis la 2.x)

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

# Composer

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

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



# Nettoyage

RUN apt-get autoremove -y && apt-get clean && rm -rf /tmp/* /var/tmp/*

Dockerfile-5.x.sh

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ a2disconf security.conf && \ 
a2enconf security-unicaen.conf php${PHP_VERSION}-fpm



# Composer 2.x (plus besoin de hirak/prestissimo depuis la 2.x)

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

curl -sS https://getcomposer.org/installer --proxy "${http_proxy}" | php -- --install-dir=/usr/local/bin --filename=composer --version 1.10.19



# Nettoyage

apt autoremove -y && apt clean

Dockerfile-7.x

+3 −2
Original line number Diff line number Diff line
@@ -127,8 +127,9 @@ ADD configs/apache/security.conf ${APACHE_CONF_DIR}/conf-available/security-unic 
RUN a2disconf security.conf && \

    a2enconf security-unicaen.conf php${PHP_VERSION}-fpm



# Composer 2.x (plus besoin de hirak/prestissimo depuis la 2.x)

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

# Composer

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

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



# Nettoyage

RUN apt-get autoremove -y && apt-get clean && rm -rf /tmp/* /var/tmp/*

Dockerfile-7.x.sh

+3 −2
Original line number Diff line number Diff line
@@ -126,8 +126,9 @@ cp configs/apache/security.conf ${APACHE_CONF_DIR}/conf-available/security-unica 
a2disconf security.conf && \

a2enconf security-unicaen.conf php${PHP_VERSION}-fpm



# Composer 2.x (plus besoin de hirak/prestissimo depuis la 2.x)

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

# Composer

curl -sS https://getcomposer.org/installer --proxy "${http_proxy}" | php -- --install-dir=/usr/local/bin --filename=composer --version 1.10.19

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



# Nettoyage

apt autoremove -y && apt clean

Dockerfile-8.x

+3 −2
Original line number Diff line number Diff line
@@ -127,8 +127,9 @@ ADD configs/apache/security.conf ${APACHE_CONF_DIR}/conf-available/security-unic 
RUN a2disconf security.conf && \

    a2enconf security-unicaen.conf php${PHP_VERSION}-fpm



# Composer 2.x (plus besoin de hirak/prestissimo depuis la 2.x)

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

# Composer

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

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



# Nettoyage

RUN apt-get autoremove -y && apt-get clean && rm -rf /tmp/* /var/tmp/*