Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
digitalLumberjack authored Jan 29, 2017
2 parents a7cace0 + accbe85 commit 7e20562
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 14 deletions.
25 changes: 13 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[![Docker Repository on Quay.io](https://quay.io/repository/digitallumberjack/gitlab-ci-multi-runner/status "Docker Repository on Quay.io")](https://quay.io/repository/digitallumberjack/gitlab-ci-multi-runner)
[![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab-ci-multi-runner/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab-ci-multi-runner)

# digitallumberjack/gitlab-ci-multi-runner:1.10.2

# sameersbn/gitlab-ci-multi-runner:1.10.2

- [Introduction](#introduction)
- [Contributing](#contributing)
Expand Down Expand Up @@ -46,18 +47,18 @@ If the above recommendations do not help then [report your issue](../../issues/n

## Installation

Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/digitallumberjack/gitlab-ci-multi-runner) and is the recommended method of installation.
Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab-ci-multi-runner) and is the recommended method of installation.

> **Note**: Builds are also available on [Quay.io](https://quay.io/repository/digitallumberjack/gitlab-ci-multi-runner)
> **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab-ci-multi-runner)
```bash
docker pull digitallumberjack/gitlab-ci-multi-runner:1.10.2
docker pull sameersbn/gitlab-ci-multi-runner:1.10.2
```

Alternatively you can build the image yourself.

```bash
docker build -t digitallumberjack/gitlab-ci-multi-runner github.com/digitallumberjack/docker-gitlab-ci-multi-runner
docker build -t sameersbn/gitlab-ci-multi-runner github.com/sameersbn/docker-gitlab-ci-multi-runner
```

## Quickstart
Expand All @@ -71,7 +72,7 @@ docker run --name gitlab-ci-multi-runner -d --restart=always \
--volume /srv/docker/gitlab-runner:/home/gitlab_ci_multi_runner/data \
--env='CI_SERVER_URL=http://git.example.com/ci' --env='RUNNER_TOKEN=xxxxxxxxx' \
--env='RUNNER_DESCRIPTION=myrunner' --env='RUNNER_EXECUTOR=shell' \
digitallumberjack/gitlab-ci-multi-runner:1.10.2
sameersbn/gitlab-ci-multi-runner:1.10.2
```

*Alternatively, you can use the sample [docker-compose.yml](docker-compose.yml) file to start the container using [Docker Compose](https://docs.docker.com/compose/)*
Expand All @@ -92,7 +93,7 @@ docker run --name gitlab-ci-multi-runner -d --restart=always \
--env='CI_SERVER_URL=http://git.example.com/ci' --env='RUNNER_TOKEN=xxxxxxxxx' \
--env='RUNNER_DESCRIPTION=myrunner' --env='RUNNER_EXECUTOR=docker' \
--env='RUNNER_DOCKER_IMAGE=docker:latest' --env='RUNNER_DOCKER_MODE=socket'
digitallumberjack/gitlab-ci-multi-runner:1.10.2
sameersbn/gitlab-ci-multi-runner:1.10.2
```

Start the docker runner in dind mode :
Expand All @@ -103,7 +104,7 @@ docker run --name gitlab-ci-multi-runner -d --restart=always \
--env='CI_SERVER_URL=http://git.example.com/ci' --env='RUNNER_TOKEN=xxxxxxxxx' \
--env='RUNNER_DESCRIPTION=myrunner' --env='RUNNER_EXECUTOR=docker' \
--env='RUNNER_DOCKER_IMAGE=docker:latest' --env='RUNNER_DOCKER_MODE=dind'
digitallumberjack/gitlab-ci-multi-runner:1.10.2
sameersbn/gitlab-ci-multi-runner:1.10.2
```

If you want to share volumes between your containers and the runner in socket mode, use the `RUNNER_DOCKER_ADDITIONAL_VOLUME` variable to share `/builds:/builds`.
Expand All @@ -124,7 +125,7 @@ You can customize the launch command by specifying arguments to `gitlab-ci-multi
```bash
docker run --name gitlab-ci-multi-runner -it --rm \
--volume /srv/docker/gitlab-runner:/home/gitlab_ci_multi_runner/data \
digitallumberjack/gitlab-ci-multi-runner:1.10.2 --help
sameersbn/gitlab-ci-multi-runner:1.10.2 --help
```

## Persistence
Expand Down Expand Up @@ -172,7 +173,7 @@ To upgrade to newer releases:
1. Download the updated Docker image:

```bash
docker pull digitallumberjack/gitlab-ci-multi-runner:1.10.2
docker pull sameersbn/gitlab-ci-multi-runner:1.10.2
```

2. Stop the currently running image:
Expand All @@ -192,7 +193,7 @@ To upgrade to newer releases:
```bash
docker run -name gitlab-ci-multi-runner -d \
[OPTIONS] \
digitallumberjack/gitlab-ci-multi-runner:1.10.2
sameersbn/gitlab-ci-multi-runner:1.10.2
```

## Shell Access
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.10.2
1.10.2
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
GitlabCIMultiRunner:
image: digitallumberjack/gitlab-ci-multi-runner:1.10.2
image: sameersbn/gitlab-ci-multi-runner:1.10.2
volumes:
- /srv/docker/gitlab-runner:/home/gitlab_ci_multi_runner/data
environment:
Expand Down

0 comments on commit 7e20562

Please sign in to comment.