Skip to content

Commit

Permalink
Merge pull request #4 from illuin-tech/upgrade-12-6
Browse files Browse the repository at this point in the history
Upgrade 12.6.0
  • Loading branch information
Jrmyy authored Jan 21, 2020
2 parents b25caea + 2622970 commit b12c0fd
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 14 deletions.
3 changes: 3 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Changelog

**12.6.0**
- bumped to runner 12.6.0

**12.2.0**
- bumped to runner 12.2.0

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM sameersbn/ubuntu:14.04.20180124
MAINTAINER [email protected]

ENV GITLAB_RUNNER_VERSION=12.2.0 \
ENV GITLAB_RUNNER_VERSION=12.6.0 \
GITLAB_RUNNER_USER=gitlab_runner \
GITLAB_RUNNER_HOME_DIR="/home/gitlab_runner"
ENV GITLAB_RUNNER_DATA_DIR="${GITLAB_RUNNER_HOME_DIR}/data"
Expand Down
20 changes: 8 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[![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/docker-gitlab-ci-multi-runner:v12.2.0
# digitallumberjack/docker-gitlab-ci-multi-runner:v12.6.0

- [Introduction](#introduction)
- [Contributing](#contributing)
Expand Down Expand Up @@ -51,7 +51,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
> **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab-ci-multi-runner)
```bash
docker pull digitallumberjack/docker-gitlab-ci-multi-runner:v12.2.0
docker pull digitallumberjack/docker-gitlab-ci-multi-runner:v12.6.0
```

Alternatively you can build the image yourself.
Expand All @@ -71,7 +71,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/docker-gitlab-ci-multi-runner:v12.2.0
digitallumberjack/docker-gitlab-ci-multi-runner:v12.6.0
```

*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 Down Expand Up @@ -110,7 +110,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/docker-gitlab-ci-multi-runner:v12.2.0
digitallumberjack/docker-gitlab-ci-multi-runner:v12.6.0
```

Start the docker runner in dind mode :
Expand All @@ -121,7 +121,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/docker-gitlab-ci-multi-runner:v12.2.0
digitallumberjack/docker-gitlab-ci-multi-runner:v12.6.0
```

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 @@ -142,7 +142,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/docker-gitlab-ci-multi-runner:v12.2.0 --help
digitallumberjack/docker-gitlab-ci-multi-runner:v12.6.0 --help
```

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

```bash
docker pull digitallumberjack/docker-gitlab-ci-multi-runner:v12.2.0
docker pull digitallumberjack/docker-gitlab-ci-multi-runner:v12.6.0
```

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

## Shell Access
Expand All @@ -220,7 +220,3 @@ For debugging and maintenance purposes you may want access the containers shell.
```bash
docker exec -it gitlab-ci-multi-runner bash
```

# List of runners using this image

* [docker-gitlab-ci-multi-runner-ruby](https://github.com/outcoldman/docker-gitlab-ci-multi-runner-ruby) to run ruby builds
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v12.2.0
v12.6.0

0 comments on commit b12c0fd

Please sign in to comment.