diff options
| author | Ionut Staicu <github@iamntz.com> | 2016-09-08 15:30:13 +0300 |
|---|---|---|
| committer | Ionut Staicu <github@iamntz.com> | 2017-01-27 06:21:29 +0200 |
| commit | 429a045d86cf833bbac9eee15e2b3b5c3eec7cff (patch) | |
| tree | 1c494e60a782d4465f41d2bfe569467e6efab9ed /doc | |
| parent | 1d6629613f35ec9ee9b4273b6dae6ae600e17752 (diff) | |
| download | gitlab-ce-429a045d86cf833bbac9eee15e2b3b5c3eec7cff.tar.gz | |
Small gramatical tweaks
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/ci/examples/README.md | 2 | ||||
| -rw-r--r-- | doc/ci/examples/deployment/composer-npm-deploy.md | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/doc/ci/examples/README.md b/doc/ci/examples/README.md index 5711a864bc8..5377bf9ee80 100644 --- a/doc/ci/examples/README.md +++ b/doc/ci/examples/README.md @@ -14,7 +14,7 @@ Apart from those, here is an collection of tutorials and guides on setting up yo - [Test a Phoenix application](test-phoenix-application.md) - [Using `dpl` as deployment tool](deployment/README.md) - [Example project that shows how to use Review Apps](https://gitlab.com/gitlab-examples/review-apps-nginx/) -- [Run PHP Composer & NPM scripts then deploy them to a stage server](deployment/composer-npm-deploy.md) +- [Run PHP Composer & NPM scripts then deploy them to a staging server](deployment/composer-npm-deploy.md) - Help your favorite programming language and GitLab by sending a merge request with a guide for that language. diff --git a/doc/ci/examples/deployment/composer-npm-deploy.md b/doc/ci/examples/deployment/composer-npm-deploy.md index c339260948e..2139d97f1bc 100644 --- a/doc/ci/examples/deployment/composer-npm-deploy.md +++ b/doc/ci/examples/deployment/composer-npm-deploy.md @@ -1,8 +1,8 @@ ## Running Composer and NPM scripts with deployment via SCP -This guide covers the building dependencies of a PHP project while compiling assets via a NPM script. +This guide covers the building dependencies of a PHP project while compiling assets via an NPM script. -While is possible to create your own image with custom PHP and Node JS version, for brevity, we will use an existing [Docker image](https://hub.docker.com/r/tetraweb/php/) that contains both PHP and NodeJS installed. +While is possible to create your own image with custom PHP and Node JS versions, for brevity, we will use an existing [Docker image](https://hub.docker.com/r/tetraweb/php/) that contains both PHP and NodeJS installed. ```yaml @@ -20,7 +20,7 @@ before_script: - php -r "unlink('composer-setup.php');" ``` -This will make sure we will have all required stuff ready to use. 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 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: ```yaml before_script: @@ -44,7 +44,7 @@ All these operations will put all files into a `build` folder, which is ready to You have multiple options: rsync, scp, sftp and so on. For now, we will use scp. To make this work, you need to add a GitLab Secret Variable (accessible on _gitlab.com/your-project-name/variables_). That variable will be called `STAGING_PRIVATE_KEY` and it's the **private** ssh key of your server. #### Security tip -Create an user that has access **only** to the folder that need to be updated! +Create a user that has access **only** to the folder that need to be updated! After you create that variable, you need to make sure that key will be added to the docker container on run: |