From 053c412d415691a8231f81e5bd55f9b6be71eead Mon Sep 17 00:00:00 2001 From: Paul des Garets Date: Tue, 27 Aug 2019 14:16:04 +0200 Subject: [PATCH 1/2] Improve docker compose --- docker-compose.yml | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index c2aa66e..dae2e1b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,10 +1,24 @@ -GitlabCIMultiRunner: - image: digitallumberjack/docker-gitlab-ci-multi-runner:v11.9.0 - volumes: - - /srv/docker/gitlab-runner:/home/gitlab_ci_multi_runner/data - environment: - - CI_SERVER_URL= - - RUNNER_TOKEN= - - RUNNER_DESCRIPTION= - - RUNNER_EXECUTOR=shell - restart: always +version: '2' + +services: + runner_docker: + restart: always + image: local-grunner + volumes: + - /var/run/docker.sock:/var/run/docker.sock + - /home/gitlab_ci_multi_runner/data + ports: + - 8000-8100:9000 + environment: + - CI_SERVER_URL=https://mydomaingitlab.com/ci + - RUNNER_TOKEN= + - RUNNER_DESCRIPTION="Docker runner" + - RUNNER_EXECUTOR=docker + - RUNNER_DOCKER_IMAGE=docker:latest + - RUNNER_DOCKER_MODE=socket + - RUNNER_AUTOUNREGISTER=true + - RUNNER_TAG_LIST=localtest + - REGISTER_RUN_UNTAGGED=false + - RUNNER_ADVERTISE_SESSION_ADDRESS=mydomain.com + - RUNNER_INTERNAL_SESSION_PORT=9000 + From f8d7bd3eff8f0490a03844ac8dd4073546268109 Mon Sep 17 00:00:00 2001 From: Paul des Garets Date: Tue, 27 Aug 2019 14:23:07 +0200 Subject: [PATCH 2/2] upgrade to 12.2.0 --- Changelog.md | 8 +++++++- Dockerfile | 2 +- README.md | 20 ++++++++++---------- VERSION | 2 +- 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/Changelog.md b/Changelog.md index b9aed3b..147962d 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,5 +1,11 @@ # Changelog +**12.2.0** + - bumped to runner 12.2.0 + +**11.9.0-1** + - Configure session server for web terminal + **11.9.0** - bumped to runner 11.9.0 @@ -40,7 +46,7 @@ **1.9.3** - gitlab-ci-multi-runner: upgrade to 1.9.3 - - added support of RUNNER_OUTPUT_LIMIT + - added support of RUNNER_OUTPUT_LIMIT **1.9.0-1** - fix restart of container diff --git a/Dockerfile b/Dockerfile index 953e52c..097fe2a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM sameersbn/ubuntu:14.04.20180124 MAINTAINER sameer@damagehead.com -ENV GITLAB_RUNNER_VERSION=11.9.0 \ +ENV GITLAB_RUNNER_VERSION=12.2.0 \ GITLAB_RUNNER_USER=gitlab_runner \ GITLAB_RUNNER_HOME_DIR="/home/gitlab_runner" ENV GITLAB_RUNNER_DATA_DIR="${GITLAB_RUNNER_HOME_DIR}/data" diff --git a/README.md b/README.md index 8a7bfaf..9bafaf5 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) -# digitallumberjack/docker-gitlab-ci-multi-runner:v11.9.0 +# digitallumberjack/docker-gitlab-ci-multi-runner:v12.2.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 digitallumberjack/docker-gitlab-ci-multi-runner:v11.9.0 +docker pull digitallumberjack/docker-gitlab-ci-multi-runner:v12.2.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' \ - digitallumberjack/docker-gitlab-ci-multi-runner:v11.9.0 + digitallumberjack/docker-gitlab-ci-multi-runner:v12.2.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/)* @@ -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:v11.9.0 + digitallumberjack/docker-gitlab-ci-multi-runner:v12.2.0 ``` Start the docker runner in dind mode : @@ -121,19 +121,19 @@ 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:v11.9.0 + digitallumberjack/docker-gitlab-ci-multi-runner:v12.2.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`. -You can increase the log maximum size by setting the RUNNER_OUTPUT_LIMIT variable (in kb) +You can increase the log maximum size by setting the RUNNER_OUTPUT_LIMIT variable (in kb) See https://docs.gitlab.com/ce/ci/docker/using_docker_build.html for more info. ## Concurrent jobs You an setup your runner to start multiple job in parallel by setting the environment variable `RUNNER_CONCURRENT` to the number of jobs you want to run concurrently. - + ## Command-line arguments @@ -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:v11.9.0 --help + digitallumberjack/docker-gitlab-ci-multi-runner:v12.2.0 --help ``` ## Persistence @@ -190,7 +190,7 @@ To upgrade to newer releases: 1. Download the updated Docker image: ```bash - docker pull digitallumberjack/docker-gitlab-ci-multi-runner:v11.9.0 + docker pull digitallumberjack/docker-gitlab-ci-multi-runner:v12.2.0 ``` 2. Stop the currently running image: @@ -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:v11.9.0 + digitallumberjack/docker-gitlab-ci-multi-runner:v12.2.0 ``` ## Shell Access diff --git a/VERSION b/VERSION index a7b32ad..9e6733f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v11.9.0 +v12.2.0