diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-06-26 14:22:12 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-06-26 14:22:12 +0000 |
| commit | 1371dfcb25948e7364ac57baddbece0abb02f95e (patch) | |
| tree | 5fa3f85bb19153b0ee98cbb6940b6e5d51d000a2 /doc | |
| parent | dfc85426493fdd9848e4f321e436d439608682cc (diff) | |
| parent | 812899d1669daacde5acf5b0a11a08a6e07a0906 (diff) | |
| download | gitlab-ce-1371dfcb25948e7364ac57baddbece0abb02f95e.tar.gz | |
Merge branch 'docs-examples-deployment-composer-npm' into 'master'
Change composer update to install to follow PHP/composer best practice
See merge request !12400
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/ci/examples/deployment/composer-npm-deploy.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/ci/examples/deployment/composer-npm-deploy.md b/doc/ci/examples/deployment/composer-npm-deploy.md index 8b0d8a003fd..b9f0485290e 100644 --- a/doc/ci/examples/deployment/composer-npm-deploy.md +++ b/doc/ci/examples/deployment/composer-npm-deploy.md @@ -20,12 +20,12 @@ before_script: - php -r "unlink('composer-setup.php');" ``` -This will make sure we have all requirements ready. Next, we want to run `composer update` to fetch all PHP dependencies and `npm install` to load node packages, then run the `npm` script. We need to append them into `before_script` section: +This will make sure we have all requirements ready. Next, we want to run `composer install` to fetch all PHP dependencies and `npm install` to load node packages, then run the `npm` script. We need to append them into `before_script` section: ```yaml before_script: # ... - - php composer.phar update + - php composer.phar install - npm install - npm run deploy ``` @@ -133,7 +133,7 @@ before_script: - php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" - php composer-setup.php - php -r "unlink('composer-setup.php');" - - php composer.phar update + - php composer.phar install - npm install - npm run deploy - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )' |