From 83a9d3ff35455d4f0edadf83f43f322c4552e4f0 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Fri, 15 Mar 2019 09:58:42 -0400 Subject: [PATCH] Changed to Docker-in-Docker --- templates/GitLab-Runner/0/README.md | 6 +++++- templates/GitLab-Runner/0/docker-compose.yml | 8 +++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/templates/GitLab-Runner/0/README.md b/templates/GitLab-Runner/0/README.md index eaa71b8..1005fad 100644 --- a/templates/GitLab-Runner/0/README.md +++ b/templates/GitLab-Runner/0/README.md @@ -1 +1,5 @@ -# GitLab Runner \ No newline at end of file +# GitLab Runner + +## Technical Notes + +* Using "Docker-in-Docker" type of configuration, [Described Here](https://docs.gitlab.com/ee/ci/docker/using_docker_build.html#use-docker-in-docker-executor) \ No newline at end of file diff --git a/templates/GitLab-Runner/0/docker-compose.yml b/templates/GitLab-Runner/0/docker-compose.yml index 6830137..04f3918 100644 --- a/templates/GitLab-Runner/0/docker-compose.yml +++ b/templates/GitLab-Runner/0/docker-compose.yml @@ -13,7 +13,8 @@ services: - --executor - "docker" - --docker-image - - alpine:latest + - docker:stable + - --docker-privileged {{- if .Values.GITLAB_RUNNER_DESCRIPTION}} - --description - ${GITLAB_RUNNER_DESCRIPTION} @@ -36,7 +37,7 @@ services: {{- end}} traefik.enable: false volumes: - - /var/run/docker.sock:/var/run/docker.sock + # - /var/run/docker.sock:/var/run/docker.sock - /RancherCattle/${DATA_DIR}:/etc/gitlab-runner gitlab-runner: image: gitlab/gitlab-runner:alpine @@ -53,7 +54,8 @@ services: {{- end}} io.rancher.sidekicks: gitlab-runner-config traefik.enable: false + privileged: true # Required for Docker-in-Docker restart: on-failure volumes: - - /var/run/docker.sock:/var/run/docker.sock + # - /var/run/docker.sock:/var/run/docker.sock - /RancherCattle/${DATA_DIR}:/etc/gitlab-runner