From 2499b3f1960da3b11105c3b22f0360871e731374 Mon Sep 17 00:00:00 2001
From: Erick Hitter <git-contrib@ethitter.com>
Date: Sun, 5 Aug 2018 12:29:35 -0700
Subject: [PATCH] Drop Docker, it's not required when using docker-machine with
an external driver
---
tasks/install-docker-machine.yml | 2 +-
tasks/install-docker.yml | 16 ----------
tasks/install-redhat.yml | 29 -------------------
...{install-debian.yml => install-runner.yml} | 0
tasks/main.yml | 12 ++------
5 files changed, 3 insertions(+), 56 deletions(-)
delete mode 100644 tasks/install-docker.yml
delete mode 100644 tasks/install-redhat.yml
rename tasks/{install-debian.yml => install-runner.yml} (100%)
diff --git a/tasks/install-docker-machine.yml b/tasks/install-docker-machine.yml
index b6f2841..f091f7c 100644
--- a/tasks/install-docker-machine.yml
+++ b/tasks/install-docker-machine.yml
@@ -2,7 +2,7 @@
- name: Get Docker Machine
get_url:
- url: "https://github.com/docker/machine/releases/download/{{ docker_machine_version }}/docker-machine-{{ ansible_system }}-{{ ansible_architecture }}"
+ url: "https://github.com/docker/machine/releases/download/{{ docker_machine_version | default('v0.15.0') }}/docker-machine-{{ ansible_system }}-{{ ansible_architecture }}"
dest: /tmp/docker-machine
- name: Install Docker Machine
diff --git a/tasks/install-docker.yml b/tasks/install-docker.yml
deleted file mode 100644
index 2f3500c..0000000
--- a/tasks/install-docker.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-- name: Add Docker signing key
- apt_key:
- url: https://download.docker.com/linux/debian/gpg
- state: present
-
-- name: Add Docker repo
- apt_repository:
- repo: 'deb [arch=amd64] https://download.docker.com/linux/debian {{ ansible_distribution_release }} stable'
- state: present
- filename: 'docker'
-
-- name: Install Docker
- apt:
- pkg: docker-ce
- update_cache: true
diff --git a/tasks/install-redhat.yml b/tasks/install-redhat.yml
deleted file mode 100644
index f2be5e4..0000000
--- a/tasks/install-redhat.yml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-
-- name: RHEL | Install GitLab GPG key
- rpm_key:
- state: present
- key: https://packages.gitlab.com/gpg.key
- when: ansible_os_family == 'RedHat'
- tags:
- - gitlab
- - gitlab-gpg
-
-- name: Install GitLab Runner dependencies
- yum:
- name: '{{ item }}'
- state: present
- with_items:
- - pygpgme
- - yum-utils
-
-- name: Add GitLab Runner rpm repo
- template:
- src: "runner.repo.j2"
- dest: "/etc/yum.repos.d/runner_{{ gitlab_runner_package_name }}.repo"
-
-- name: Install GitLab Runner
- yum:
- name: "{{ gitlab_runner_package_name }}"
- state: latest
- update_cache: yes
diff --git a/tasks/install-debian.yml b/tasks/install-runner.yml
similarity index 100%
rename from tasks/install-debian.yml
rename to tasks/install-runner.yml
diff --git a/tasks/main.yml b/tasks/main.yml
index d08afac..7a1f405 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,14 +1,6 @@
---
-- name: Install GitLab Runner (Debian)
- import_tasks: install-debian.yml
- when: ansible_os_family == 'Debian'
-
-- name: Install GitLab Runner (RedHat)
- import_tasks: install-redhat.yml
- when: ansible_os_family == 'RedHat'
-
-- name: Install Docker
- import_tasks: install-docker.yml
+- name: Install GitLab Runner
+ import_tasks: install-runner.yml
- name: Install Docker Machine
import_tasks: install-docker-machine.yml
--
GitLab