Merge pull request #74 from zepgram/develop

[#73] lock composer to version 1.x

provision/010-system-packages.sh

@@ -44,6 +44,7 @@ echo "deb https://packages.sury.org/php/ stretch main" | tee /etc/apt/sources.li
 # Percona repository
 wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
 dpkg -i percona-release_latest.$(lsb_release -sc)_all.deb
+rm -f percona-release_latest.$(lsb_release -sc)_all.deb
 
 # Elasticsearch repository
 wget -qO - https://artifacts.elastic.co/GPG-KEY-elasticsearch | apt-key add -
@@ -66,8 +67,8 @@ if $(dpkg --compare-versions "${PROJECT_PHP_VERSION}" "lt" "7.2"); then
   apt-get install -y php"${PROJECT_PHP_VERSION}"-mcrypt
 fi
 
-# Composer
-curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+# Composer v1.x
+curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer --1
 
 # Prestissimo speed up installation
 sudo -u vagrant composer global require hirak/prestissimo

provision/100-magento-pre.sh

@@ -64,17 +64,8 @@ chmod 600 /home/vagrant/.ssh/id_rsa.pub
 rm -rf /home/vagrant/.ssh/known_hosts /home/vagrant/.ssh/config
 echo -e "StrictHostKeyChecking no\n" >> /home/vagrant/.ssh/config
 ssh-keyscan -t rsa "${PROJECT_HOST_REPOSITORY}" >> /home/vagrant/.ssh/known_hosts
-mkdir -p /home/vagrant/.composer
-cat <<-EOF > /home/vagrant/.composer/auth.json
-{
-    "http-basic": {
-        "repo.magento.com": {
-            "username": "${PROJECT_COMPOSER_USER}",
-            "password": "${PROJECT_COMPOSER_PASS}"
-        }
-    }
-}
-EOF
+composer config --global http-basic.repo.magento.com "${PROJECT_COMPOSER_USER}" "${PROJECT_COMPOSER_PASS}"
+sudo -u vagrant composer config --global http-basic.repo.magento.com "${PROJECT_COMPOSER_USER}" "${PROJECT_COMPOSER_PASS}"
 
 # Git global config
 if [ "$PROJECT_SOURCE" != "composer" ]; then