Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-30 09:07:59 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-30 09:07:59 +0300
commit7421e6f9f2b5889b05738af7eba568af6ae3fcbc (patch)
tree0c7f9656565ae4ef09611345248ea518c4deb5b8 /doc/ci/examples
parentbf32dbaad2b059a3bf3e880c08cb0a026effc158 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci/examples')
-rw-r--r--doc/ci/examples/php.md13
1 files changed, 4 insertions, 9 deletions
diff --git a/doc/ci/examples/php.md b/doc/ci/examples/php.md
index 04a6a4ddef2..6a6c0e8fde1 100644
--- a/doc/ci/examples/php.md
+++ b/doc/ci/examples/php.md
@@ -13,7 +13,7 @@ using the Shell executor.
While it is possible to test PHP apps on any system, this would require manual
configuration from the developer. To overcome this we will be using the
-official [PHP docker image][php-hub] that can be found in Docker Hub.
+official [PHP docker image](https://hub.docker.com/_/php) that can be found in Docker Hub.
This will allow us to test PHP projects against different versions of PHP.
However, not everything is plug 'n' play, you still need to configure some
@@ -170,12 +170,12 @@ Finally, push to GitLab and let the tests begin!
### Test against different PHP versions in Shell builds
-The [phpenv][] project allows you to easily manage different versions of PHP
+The [phpenv](https://github.com/phpenv/phpenv) project allows you to easily manage different versions of PHP
each with its own config. This is especially useful when testing PHP projects
with the Shell executor.
You will have to install it on your build machine under the `gitlab-runner`
-user following [the upstream installation guide][phpenv-installation].
+user following [the upstream installation guide](https://github.com/phpenv/phpenv#installation).
Using phpenv also allows to easily configure the PHP environment with:
@@ -279,14 +279,9 @@ gitlab-runner exec shell test:app
## Example project
-We have set up an [Example PHP Project][php-example-repo] for your convenience
+We have set up an [Example PHP Project](https://gitlab.com/gitlab-examples/php) for your convenience
that runs on [GitLab.com](https://gitlab.com) using our publicly available
[shared runners](../runners/README.md).
Want to hack on it? Simply fork it, commit, and push your changes. Within a few
moments the changes will be picked by a public runner and the job will begin.
-
-[php-hub]: https://hub.docker.com/_/php
-[phpenv]: https://github.com/phpenv/phpenv
-[phpenv-installation]: https://github.com/phpenv/phpenv#installation
-[php-example-repo]: https://gitlab.com/gitlab-examples/php