Revert "Merge pull request #31 from Slamdunk/native_composer_home"

This reverts commit 9249153, reversing changes made to e2020af.
chialab · Feb 23, 2018 · 2e4c1ac · 2e4c1ac
1 parent 9249153
commit 2e4c1ac
Show file tree

Hide file tree

Showing 19 changed files with 38 additions and 19 deletions.
diff --git a/5.4/Dockerfile b/5.4/Dockerfile
@@ -33,5 +33,6 @@ 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 config --global home)/vendor/bin:$PATH
+ENV PATH $COMPOSER_HOME/vendor/bin:$PATH
diff --git a/5.4/apache/Dockerfile b/5.4/apache/Dockerfile
@@ -34,5 +34,6 @@ 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 config --global home)/vendor/bin:$PATH
+ENV PATH $COMPOSER_HOME/vendor/bin:$PATH
diff --git a/5.4/fpm/Dockerfile b/5.4/fpm/Dockerfile
@@ -33,5 +33,6 @@ 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 config --global home)/vendor/bin:$PATH
+ENV PATH $COMPOSER_HOME/vendor/bin:$PATH
diff --git a/5.5/Dockerfile b/5.5/Dockerfile
@@ -33,5 +33,6 @@ 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 config --global home)/vendor/bin:$PATH
+ENV PATH $COMPOSER_HOME/vendor/bin:$PATH
diff --git a/5.5/apache/Dockerfile b/5.5/apache/Dockerfile
@@ -34,5 +34,6 @@ 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 config --global home)/vendor/bin:$PATH
+ENV PATH $COMPOSER_HOME/vendor/bin:$PATH
diff --git a/5.5/fpm/Dockerfile b/5.5/fpm/Dockerfile
@@ -33,5 +33,6 @@ 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 config --global home)/vendor/bin:$PATH
+ENV PATH $COMPOSER_HOME/vendor/bin:$PATH
diff --git a/5.6/Dockerfile b/5.6/Dockerfile
@@ -33,5 +33,6 @@ 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 config --global home)/vendor/bin:$PATH
+ENV PATH $COMPOSER_HOME/vendor/bin:$PATH
diff --git a/5.6/apache/Dockerfile b/5.6/apache/Dockerfile
@@ -34,5 +34,6 @@ 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 config --global home)/vendor/bin:$PATH
+ENV PATH $COMPOSER_HOME/vendor/bin:$PATH
diff --git a/5.6/fpm/Dockerfile b/5.6/fpm/Dockerfile
@@ -33,5 +33,6 @@ 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 config --global home)/vendor/bin:$PATH
+ENV PATH $COMPOSER_HOME/vendor/bin:$PATH
diff --git a/7.0/Dockerfile b/7.0/Dockerfile
@@ -33,5 +33,6 @@ 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 config --global home)/vendor/bin:$PATH
+ENV PATH $COMPOSER_HOME/vendor/bin:$PATH
diff --git a/7.0/apache/Dockerfile b/7.0/apache/Dockerfile
@@ -34,5 +34,6 @@ 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 config --global home)/vendor/bin:$PATH
+ENV PATH $COMPOSER_HOME/vendor/bin:$PATH
diff --git a/7.0/fpm/Dockerfile b/7.0/fpm/Dockerfile
@@ -33,5 +33,6 @@ 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 config --global home)/vendor/bin:$PATH
+ENV PATH $COMPOSER_HOME/vendor/bin:$PATH
diff --git a/7.1/Dockerfile b/7.1/Dockerfile
@@ -33,5 +33,6 @@ 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 config --global home)/vendor/bin:$PATH
+ENV PATH $COMPOSER_HOME/vendor/bin:$PATH
diff --git a/7.1/apache/Dockerfile b/7.1/apache/Dockerfile
@@ -34,5 +34,6 @@ 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 config --global home)/vendor/bin:$PATH
+ENV PATH $COMPOSER_HOME/vendor/bin:$PATH
diff --git a/7.1/fpm/Dockerfile b/7.1/fpm/Dockerfile
@@ -33,5 +33,6 @@ 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 config --global home)/vendor/bin:$PATH
+ENV PATH $COMPOSER_HOME/vendor/bin:$PATH
diff --git a/7.2/Dockerfile b/7.2/Dockerfile
@@ -32,5 +32,6 @@ 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 config --global home)/vendor/bin:$PATH
+ENV PATH $COMPOSER_HOME/vendor/bin:$PATH
diff --git a/7.2/apache/Dockerfile b/7.2/apache/Dockerfile
@@ -33,5 +33,6 @@ 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 config --global home)/vendor/bin:$PATH
+ENV PATH $COMPOSER_HOME/vendor/bin:$PATH
diff --git a/7.2/fpm/Dockerfile b/7.2/fpm/Dockerfile
@@ -32,5 +32,6 @@ 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 config --global home)/vendor/bin:$PATH
+ENV PATH $COMPOSER_HOME/vendor/bin:$PATH
diff --git a/Dockerfile b/Dockerfile
@@ -32,5 +32,6 @@ 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 config --global home)/vendor/bin:$PATH
+ENV PATH $COMPOSER_HOME/vendor/bin:$PATH