Commit Graph
200 Commits
Author SHA1 Message Date
Achilleas Pipinellis 429f537035 Merge branch 'patch-3' into 'master'
blost -> blog



See merge request !4063
2016-05-08 18:46:48 +00:00
Achilleas Pipinellis b1837eef4b Merge branch 'update-doc-ci-examples' into 'master'
Update CI example docs.

Docs for CI examples are updated as follows:

- Fix a dead link from CI example top to `dpl`
- Specify Django for a Python project, not Rails
- Use the latest Python Docker image as [Heroku supports only Python 3.5.1 (and 2.7.11)](https://devcenter.heroku.com/articles/python-support)
- Show the latest Docker Hub URL links.

See merge request !4082
2016-05-08 10:26:46 +00:00
Takuya Noguchi 3c8265559a Rename Docker with Docker Engine. 2016-05-07 14:54:36 +09:00
Takuya Noguchi 9522131259 Update Docker Hub links. 2016-05-07 13:29:24 +09:00
Takuya Noguchi dd4fe8e9bb Update CI example docs. 2016-05-07 13:15:04 +09:00
Ben Bodenmiller 80b30500e4 blost -> blog 2016-05-06 00:42:13 +00:00
Rémy Coutable ec7dee4f63 Merge branch 'gitlab-ci-ssh-keys-doc-fix' into 'master'
Documentation fix in CI SSH keys setup

In recent versions of Docker, the `/.dockerinit` file doesn't exist any more when running inside a container. That file is used in the example here to detect whether the runner is running inside Docker or not. Change it to check for the existence of `/.dockerenv`, which does exist in all current versions of Docker.

See merge request !3938
2016-05-04 16:46:57 +00:00
Achilleas Pipinellis 45f4cc6e9b Merge branch 'fix/docker-in-docker-ci-documentation' into 'master'
Update using_docker_build.md, clarify the 'privileged' mode requirement

Related to #15428

Fixes gitlab-org/gitlab-ci-multi-runner#1261

See merge request !3909
2016-04-28 10:59:20 +00:00
Achilleas Pipinellis 8b09dafb16 Copyedit using_docker_build.md and fix links 2016-04-28 13:04:53 +03:00
David de Boer 7c9233856e Add API doc example with query string for triggering build 2016-04-27 16:41:37 +02:00
Jason Roehm 0ace42cdb9 fix: in recent versions of Docker, the /.dockerinit file doesn't exist; use /.dockerenv instead [ci skip]
Signed-off-by: Jason Roehm <jasonr@3db-labs.com>
2016-04-26 21:41:52 -04:00
Achilleas Pipinellis ad46466cb9 Merge branch 'fix/ci-docker-images-documentation' into 'master'
Replace '-n' with '--name' in docker related documentation

`-n` for `docker run` is outdated. We should use `--name` instead. This MR fixes the example in documentation.

Fixes #15174

See merge request !3908
2016-04-25 19:29:02 +00:00
Tomasz Maczukin 5fc6a7dc14 Update using_docker_build.md, clarify the 'privileged' mode requirement
[ci skip]
2016-04-25 13:51:17 +02:00
Tomasz Maczukin 9bd0f46a85 Replace '-n' with '--name' in docker related documentation
[ci skip]
2016-04-25 12:13:50 +02:00
Tomasz Maczukin c55f517719 Fix php-docker example (for new docker versions)
[ci skip]
2016-04-25 11:35:33 +02:00
Tomasz Maczukin 4019b0d872 Fix some typos in documentation
[ci skip]
2016-04-20 11:54:06 +02:00
Tomasz Maczukin 0725c28069 Add documentation of incremental trace update API
[ci skip]
2016-04-20 11:54:05 +02:00
Grzegorz Bizon fd13cd189f Merge branch 'docs/notice-about-gitlab-runner' into 'master'
Add notice about GitLab Runner to requirements docs

This is related to #14589, and problems that may stem from running
GitLab Runner on same machine user installed GitLab web app on.

See merge request !3518
2016-04-19 12:17:48 +00:00
Kamil Trzcinski 2ab8d3e652 Merge branch 'after-script' into make-before-after-overridable 2016-04-18 09:47:12 -04:00
Kamil Trzcinski aca1e14bd3 Merge remote-tracking branch 'origin/master' into after-script 2016-04-18 09:46:12 -04:00
Kamil Trzcinski 39c2677e86 Merge remote-tracking branch 'origin/master' into after-script 2016-04-18 09:43:45 -04:00
Kamil Trzcinski 42102b4344 Merge branch 'after-script' into make-before-after-overridable 2016-04-18 07:53:21 -04:00
Grzegorz Bizon 2972a991df Add minor fixes in docs for job-specific variables 2016-04-18 13:17:48 +02:00
Grzegorz Bizon a2957291b3 Update documentation on job level build variables 2016-04-18 13:17:48 +02:00
Grzegorz Bizon a264973905 Improve grammar in CI documentation for build vars 2016-04-18 13:17:48 +02:00
Grzegorz Bizon 5d89bdb16a Add documentation for job-level build variables 2016-04-18 13:17:48 +02:00
Kamil Trzcinski c764b57f09 Add note about version 2016-04-17 09:11:37 -04:00
Kamil Trzcinski 38b15e35d4 Update CHANGELOG and add documentation 2016-04-17 09:10:47 -04:00
Kamil Trzcinski a0afeefd76 Add CHANGELOG and documentation 2016-04-17 09:02:42 -04:00
Robert Schilling 178dfb1917 Merge branch 'typos_in_ci_doc' into 'master'
Fix typos in CI docs.



See merge request !3709
2016-04-16 10:44:14 +00:00
Jamie Neubert Pedersen b49069b72c change: "very demand" changed to "specific demand"
This must be an error as the sentence doesn't make sense otherwise
2016-04-14 16:04:18 +00:00
Achilleas Pipinellis 072b9c2c8f Add TOC to yaml README and an intro section
[ci skip]
2016-04-14 15:40:05 +03:00
Hyunwoo Jung f2aacc25fb Fix typos in CI docs. 2016-04-13 21:19:50 +00:00
Lee fd248b0f06 (doc) fix typo to ssh keys doc url 2016-04-12 16:13:31 -05:00
Achilleas Pipinellis d86190eead Add a note about installing Runners in ci/runners/README.md 2016-04-11 12:41:27 +03:00
Benjamin Montgomery 84ff30a6b2 fix typo 2016-04-10 21:16:06 +00:00
Benjamin Montgomery 1e99e56202 Make the purpose of artifact config options clearer 2016-04-10 21:14:40 +00:00
Benjamin Montgomery ca823065a9 actually enable artifacts 2016-04-09 20:51:15 +00:00
Alex Mayer 875646a85e Fix Incorrect Quote In Docker Executor Example 2016-04-07 20:10:29 +00:00
frodsan 71b5010a94 [ci skip] Fix typo. 2016-04-06 22:45:56 +00:00
Kamil Trzciński fc6ee35928 Merge branch 'feature-ci-only-except-trigger' into 'master'
CI: Add 'triggers' keyword to 'only' and 'except' lists to allow control over when triggers cause builds to run

Currently, the `only` and `except` keywords in `.gitlab-ci.yml` only accept ref names or the special `branches` and `tags` keywords. However, these are primarily useful when controlling how repository activity affects the creation of builds. In my case, instead of building on every commit, I'd like to use the following logic:

- If the repository is tagged, do a build.
- Any other normal commits should not cause a build.
- If a build is triggered via the API, always create one for the specified ref.

From what I can tell, this isn't possible via the existing YAML syntax. In this MR, I introduce a new keyword `triggers` that goes along with `branches` and `tags`. I can implement the logic above using the following job configuration:

```yaml
only:
  - tags
  - triggers
```

I updated the tests and documentation to reflect this and everything seems to pass.

See merge request !3230
2016-03-22 09:42:40 +00:00
Pat Turner 280d9dc23f fixed md anchor link 2016-03-18 11:46:19 +00:00
Pat Turner 44ca0305cd Fix for https://gitlab.com/gitlab-org/gitlab-ce/issues/14366 2016-03-18 08:32:56 +00:00
Pat Turner 08ed12d91e removed anchor as unsupported in markdown 2016-03-17 17:27:13 +00:00
Pat Turner 0ce1f9387a Fix for https://gitlab.com/gitlab-org/gitlab-ce/issues/14366 2016-03-17 15:28:55 +00:00
Achilleas Pipinellis 5b1db58c85 Merge branch 'master' into rm_duplicate_cache_ci_docs 2016-03-17 15:56:44 +02:00
Mark Pundsack 315d875954 Fix typo in README.md. 2016-03-16 18:04:42 +00:00
Jeroen van Baarsen 0732500595 Merge branch 'patch-1' into 'master'
Fix typo in Ruby CI test and deploy example

[skip ci]

See merge request !3201
2016-03-15 16:13:49 +00:00
Jason Roehm b6ede12729 add some documentation for triggers keyword [ci skip] 2016-03-15 09:46:09 -04:00
Achilleas Pipinellis 090368f6c6 Windows CI support is full since Runner v1.0.0
[ci skip]
2016-03-15 12:46:21 +02:00