From 6c55ae80a8ad38ecdef59404121e44fb5504e50e Mon Sep 17 00:00:00 2001 From: digitalLumberjack Date: Sun, 26 Feb 2017 11:39:53 +0100 Subject: [PATCH] bumped to 1.11.0 --- Changelog.md | 6 ++++++ Dockerfile | 2 +- README.md | 16 ++++++++-------- VERSION | 2 +- docker-compose.yml | 2 +- 5 files changed, 17 insertions(+), 11 deletions(-) diff --git a/Changelog.md b/Changelog.md index e912c68..b003248 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,5 +1,11 @@ # Changelog +**1.11.0** + - added RUNNER_AUTOUNREGISTER option + +**1.10.4-2** + - added RUNNER_AUTOUNREGISTER option + **1.10.4** - gitlab-ci-multi-runner: upgrade to 1.10.4 diff --git a/Dockerfile b/Dockerfile index 7e4a5b4..6801175 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM sameersbn/ubuntu:14.04.20170110 MAINTAINER sameer@damagehead.com -ENV GITLAB_CI_MULTI_RUNNER_VERSION=1.10.4 \ +ENV GITLAB_CI_MULTI_RUNNER_VERSION=1.11.0 \ GITLAB_CI_MULTI_RUNNER_USER=gitlab_ci_multi_runner \ GITLAB_CI_MULTI_RUNNER_HOME_DIR="/home/gitlab_ci_multi_runner" ENV GITLAB_CI_MULTI_RUNNER_DATA_DIR="${GITLAB_CI_MULTI_RUNNER_HOME_DIR}/data" diff --git a/README.md b/README.md index 9986d1d..4227a9b 100644 --- a/README.md +++ b/README.md @@ -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) -# sameersbn/gitlab-ci-multi-runner:1.10.4 +# sameersbn/gitlab-ci-multi-runner:1.11.0 - [Introduction](#introduction) - [Contributing](#contributing) @@ -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 sameersbn/gitlab-ci-multi-runner:1.10.4 +docker pull sameersbn/gitlab-ci-multi-runner:1.11.0 ``` Alternatively you can build the image yourself. @@ -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' \ - sameersbn/gitlab-ci-multi-runner:1.10.4 + sameersbn/gitlab-ci-multi-runner:1.11.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/)* @@ -109,7 +109,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' - sameersbn/gitlab-ci-multi-runner:1.10.4 + sameersbn/gitlab-ci-multi-runner:1.11.0 ``` Start the docker runner in dind mode : @@ -120,7 +120,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' - sameersbn/gitlab-ci-multi-runner:1.10.4 + sameersbn/gitlab-ci-multi-runner:1.11.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`. @@ -141,7 +141,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 \ - sameersbn/gitlab-ci-multi-runner:1.10.4 --help + sameersbn/gitlab-ci-multi-runner:1.11.0 --help ``` ## Persistence @@ -189,7 +189,7 @@ To upgrade to newer releases: 1. Download the updated Docker image: ```bash - docker pull sameersbn/gitlab-ci-multi-runner:1.10.4 + docker pull sameersbn/gitlab-ci-multi-runner:1.11.0 ``` 2. Stop the currently running image: @@ -209,7 +209,7 @@ To upgrade to newer releases: ```bash docker run -name gitlab-ci-multi-runner -d \ [OPTIONS] \ - sameersbn/gitlab-ci-multi-runner:1.10.4 + sameersbn/gitlab-ci-multi-runner:1.11.0 ``` ## Shell Access diff --git a/VERSION b/VERSION index 18b3114..1cac385 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.10.4 +1.11.0 diff --git a/docker-compose.yml b/docker-compose.yml index 5c5941c..ac6a1ed 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,5 @@ GitlabCIMultiRunner: - image: sameersbn/gitlab-ci-multi-runner:1.10.4 + image: sameersbn/gitlab-ci-multi-runner:1.11.0 volumes: - /srv/docker/gitlab-runner:/home/gitlab_ci_multi_runner/data environment: