From 3f1543438b3a8975e671284e8c21eb0394b1eb4d Mon Sep 17 00:00:00 2001
From: David Mehren <git@herrmehren.de>
Date: Sun, 9 Jul 2023 11:39:53 +0200
Subject: [PATCH] Use geerlingguy.docker role to set up Docker
---
meta/main.yml | 5 +++--
tasks/plantuml.yml | 24 ------------------------
2 files changed, 3 insertions(+), 26 deletions(-)
diff --git a/meta/main.yml b/meta/main.yml
index 277f5a3..097c60d 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -8,5 +8,6 @@ galaxy_info:
- name: Ubuntu
versions:
- all
-dependencies: []
- # - elasticsearch
+dependencies:
+ - role: geerlingguy.docker
+ when: gitlab_enable_plantuml
diff --git a/tasks/plantuml.yml b/tasks/plantuml.yml
index b07e99b..2818fe6 100644
--- a/tasks/plantuml.yml
+++ b/tasks/plantuml.yml
@@ -2,30 +2,6 @@
- name: Install prerequisites for docker
ansible.builtin.apt:
name:
- - apt-transport-https
- - ca-certificates
- - curl
- - gnupg-agent
- - software-properties-common
- state: present
- update_cache: true
-
-- name: Add docker key
- ansible.builtin.apt_key:
- url: https://download.docker.com/linux/ubuntu/gpg
- state: present
-
-- name: Add docker repo
- ansible.builtin.apt_repository:
- repo: "deb [arch=amd64] https://download.docker.com/linux/ubuntu {{ ansible_lsb.codename }} stable"
- state: present
-
-- name: Install prerequisites for docker
- ansible.builtin.apt:
- name:
- - docker-ce
- - docker-ce-cli
- - containerd.io
- python3-docker
state: present
update_cache: true
--
GitLab