From a681fae64cebbe03fcd3e0fc6d2bb58e5411b052 Mon Sep 17 00:00:00 2001 From: Filippo Tessarotto Date: Thu, 22 Feb 2018 15:02:31 +0100 Subject: [PATCH] Use native composer home --- 5.4/Dockerfile | 3 +-- 5.4/apache/Dockerfile | 3 +-- 5.4/fpm/Dockerfile | 3 +-- 5.5/Dockerfile | 3 +-- 5.5/apache/Dockerfile | 3 +-- 5.5/fpm/Dockerfile | 3 +-- 5.6/Dockerfile | 3 +-- 5.6/apache/Dockerfile | 3 +-- 5.6/fpm/Dockerfile | 3 +-- 7.0/Dockerfile | 3 +-- 7.0/apache/Dockerfile | 3 +-- 7.0/fpm/Dockerfile | 3 +-- 7.1/Dockerfile | 3 +-- 7.1/apache/Dockerfile | 3 +-- 7.1/fpm/Dockerfile | 3 +-- 7.2/Dockerfile | 3 +-- 7.2/apache/Dockerfile | 3 +-- 7.2/fpm/Dockerfile | 3 +-- Dockerfile | 3 +-- 19 files changed, 19 insertions(+), 38 deletions(-) diff --git a/5.4/Dockerfile b/5.4/Dockerfile index d90bac5..5321008 100644 --- a/5.4/Dockerfile +++ b/5.4/Dockerfile @@ -33,6 +33,5 @@ RUN buildDeps=" \ && rm -r /var/lib/apt/lists/* # Install Composer. -ENV COMPOSER_HOME /root/composer RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer -ENV PATH $COMPOSER_HOME/vendor/bin:$PATH +ENV PATH $(composer config --global home)/vendor/bin:$PATH diff --git a/5.4/apache/Dockerfile b/5.4/apache/Dockerfile index 8f51056..ea826d1 100644 --- a/5.4/apache/Dockerfile +++ b/5.4/apache/Dockerfile @@ -34,6 +34,5 @@ RUN buildDeps=" \ && a2enmod rewrite # Install Composer. -ENV COMPOSER_HOME /root/composer RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer -ENV PATH $COMPOSER_HOME/vendor/bin:$PATH +ENV PATH $(composer config --global home)/vendor/bin:$PATH diff --git a/5.4/fpm/Dockerfile b/5.4/fpm/Dockerfile index 0c3b23d..2da079a 100644 --- a/5.4/fpm/Dockerfile +++ b/5.4/fpm/Dockerfile @@ -33,6 +33,5 @@ RUN buildDeps=" \ && rm -r /var/lib/apt/lists/* # Install Composer. -ENV COMPOSER_HOME /root/composer RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer -ENV PATH $COMPOSER_HOME/vendor/bin:$PATH +ENV PATH $(composer config --global home)/vendor/bin:$PATH diff --git a/5.5/Dockerfile b/5.5/Dockerfile index dd45887..debf172 100644 --- a/5.5/Dockerfile +++ b/5.5/Dockerfile @@ -33,6 +33,5 @@ RUN buildDeps=" \ && rm -r /var/lib/apt/lists/* # Install Composer. -ENV COMPOSER_HOME /root/composer RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer -ENV PATH $COMPOSER_HOME/vendor/bin:$PATH +ENV PATH $(composer config --global home)/vendor/bin:$PATH diff --git a/5.5/apache/Dockerfile b/5.5/apache/Dockerfile index 59cfce3..346426d 100644 --- a/5.5/apache/Dockerfile +++ b/5.5/apache/Dockerfile @@ -34,6 +34,5 @@ RUN buildDeps=" \ && a2enmod rewrite # Install Composer. -ENV COMPOSER_HOME /root/composer RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer -ENV PATH $COMPOSER_HOME/vendor/bin:$PATH +ENV PATH $(composer config --global home)/vendor/bin:$PATH diff --git a/5.5/fpm/Dockerfile b/5.5/fpm/Dockerfile index f40695b..18f9c79 100644 --- a/5.5/fpm/Dockerfile +++ b/5.5/fpm/Dockerfile @@ -33,6 +33,5 @@ RUN buildDeps=" \ && rm -r /var/lib/apt/lists/* # Install Composer. -ENV COMPOSER_HOME /root/composer RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer -ENV PATH $COMPOSER_HOME/vendor/bin:$PATH +ENV PATH $(composer config --global home)/vendor/bin:$PATH diff --git a/5.6/Dockerfile b/5.6/Dockerfile index de14762..bb55a0d 100644 --- a/5.6/Dockerfile +++ b/5.6/Dockerfile @@ -33,6 +33,5 @@ RUN buildDeps=" \ && rm -r /var/lib/apt/lists/* # Install Composer. -ENV COMPOSER_HOME /root/composer RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer -ENV PATH $COMPOSER_HOME/vendor/bin:$PATH +ENV PATH $(composer config --global home)/vendor/bin:$PATH diff --git a/5.6/apache/Dockerfile b/5.6/apache/Dockerfile index be9817c..f4fe044 100644 --- a/5.6/apache/Dockerfile +++ b/5.6/apache/Dockerfile @@ -34,6 +34,5 @@ RUN buildDeps=" \ && a2enmod rewrite # Install Composer. -ENV COMPOSER_HOME /root/composer RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer -ENV PATH $COMPOSER_HOME/vendor/bin:$PATH +ENV PATH $(composer config --global home)/vendor/bin:$PATH diff --git a/5.6/fpm/Dockerfile b/5.6/fpm/Dockerfile index 77ee3bd..bdba8a7 100644 --- a/5.6/fpm/Dockerfile +++ b/5.6/fpm/Dockerfile @@ -33,6 +33,5 @@ RUN buildDeps=" \ && rm -r /var/lib/apt/lists/* # Install Composer. -ENV COMPOSER_HOME /root/composer RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer -ENV PATH $COMPOSER_HOME/vendor/bin:$PATH +ENV PATH $(composer config --global home)/vendor/bin:$PATH diff --git a/7.0/Dockerfile b/7.0/Dockerfile index 921b0cd..51e2262 100644 --- a/7.0/Dockerfile +++ b/7.0/Dockerfile @@ -33,6 +33,5 @@ RUN buildDeps=" \ && rm -r /var/lib/apt/lists/* # Install Composer. -ENV COMPOSER_HOME /root/composer RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer -ENV PATH $COMPOSER_HOME/vendor/bin:$PATH +ENV PATH $(composer config --global home)/vendor/bin:$PATH diff --git a/7.0/apache/Dockerfile b/7.0/apache/Dockerfile index a799c63..f432c7f 100644 --- a/7.0/apache/Dockerfile +++ b/7.0/apache/Dockerfile @@ -34,6 +34,5 @@ RUN buildDeps=" \ && a2enmod rewrite # Install Composer. -ENV COMPOSER_HOME /root/composer RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer -ENV PATH $COMPOSER_HOME/vendor/bin:$PATH +ENV PATH $(composer config --global home)/vendor/bin:$PATH diff --git a/7.0/fpm/Dockerfile b/7.0/fpm/Dockerfile index 62084d2..0d10a0c 100644 --- a/7.0/fpm/Dockerfile +++ b/7.0/fpm/Dockerfile @@ -33,6 +33,5 @@ RUN buildDeps=" \ && rm -r /var/lib/apt/lists/* # Install Composer. -ENV COMPOSER_HOME /root/composer RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer -ENV PATH $COMPOSER_HOME/vendor/bin:$PATH +ENV PATH $(composer config --global home)/vendor/bin:$PATH diff --git a/7.1/Dockerfile b/7.1/Dockerfile index d7d32d0..0e62d88 100644 --- a/7.1/Dockerfile +++ b/7.1/Dockerfile @@ -33,6 +33,5 @@ RUN buildDeps=" \ && rm -r /var/lib/apt/lists/* # Install Composer. -ENV COMPOSER_HOME /root/composer RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer -ENV PATH $COMPOSER_HOME/vendor/bin:$PATH +ENV PATH $(composer config --global home)/vendor/bin:$PATH diff --git a/7.1/apache/Dockerfile b/7.1/apache/Dockerfile index 1ed97af..56fe719 100644 --- a/7.1/apache/Dockerfile +++ b/7.1/apache/Dockerfile @@ -34,6 +34,5 @@ RUN buildDeps=" \ && a2enmod rewrite # Install Composer. -ENV COMPOSER_HOME /root/composer RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer -ENV PATH $COMPOSER_HOME/vendor/bin:$PATH +ENV PATH $(composer config --global home)/vendor/bin:$PATH diff --git a/7.1/fpm/Dockerfile b/7.1/fpm/Dockerfile index d32a100..31c5cc3 100644 --- a/7.1/fpm/Dockerfile +++ b/7.1/fpm/Dockerfile @@ -33,6 +33,5 @@ RUN buildDeps=" \ && rm -r /var/lib/apt/lists/* # Install Composer. -ENV COMPOSER_HOME /root/composer RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer -ENV PATH $COMPOSER_HOME/vendor/bin:$PATH +ENV PATH $(composer config --global home)/vendor/bin:$PATH diff --git a/7.2/Dockerfile b/7.2/Dockerfile index 5a4c381..7c2a052 100644 --- a/7.2/Dockerfile +++ b/7.2/Dockerfile @@ -32,6 +32,5 @@ RUN buildDeps=" \ && rm -r /var/lib/apt/lists/* # Install Composer. -ENV COMPOSER_HOME /root/composer RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer -ENV PATH $COMPOSER_HOME/vendor/bin:$PATH +ENV PATH $(composer config --global home)/vendor/bin:$PATH diff --git a/7.2/apache/Dockerfile b/7.2/apache/Dockerfile index 58075d1..343e365 100644 --- a/7.2/apache/Dockerfile +++ b/7.2/apache/Dockerfile @@ -33,6 +33,5 @@ RUN buildDeps=" \ && a2enmod rewrite # Install Composer. -ENV COMPOSER_HOME /root/composer RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer -ENV PATH $COMPOSER_HOME/vendor/bin:$PATH +ENV PATH $(composer config --global home)/vendor/bin:$PATH diff --git a/7.2/fpm/Dockerfile b/7.2/fpm/Dockerfile index 67b0459..16857cc 100644 --- a/7.2/fpm/Dockerfile +++ b/7.2/fpm/Dockerfile @@ -32,6 +32,5 @@ RUN buildDeps=" \ && rm -r /var/lib/apt/lists/* # Install Composer. -ENV COMPOSER_HOME /root/composer RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer -ENV PATH $COMPOSER_HOME/vendor/bin:$PATH +ENV PATH $(composer config --global home)/vendor/bin:$PATH diff --git a/Dockerfile b/Dockerfile index a610ec1..23592b3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,6 +32,5 @@ RUN buildDeps=" \ && rm -r /var/lib/apt/lists/* # Install Composer. -ENV COMPOSER_HOME /root/composer RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer -ENV PATH $COMPOSER_HOME/vendor/bin:$PATH +ENV PATH $(composer config --global home)/vendor/bin:$PATH