summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThedro Neely <thedroneely@gmail.com>2020-03-23 16:42:44 -0400
committerThedro Neely <thedroneely@gmail.com>2020-03-23 16:42:44 -0400
commit1db40cdf9cb25b446ffd15dfd1e3e6f178ae2257 (patch)
treead9c096f756250feddc9d65e9a8b95234f13195c
parent93c8aa558ed74a6e2f274114386268c35b100824 (diff)
downloadplaybooks-1db40cdf9cb25b446ffd15dfd1e3e6f178ae2257.tar.gz
playbooks-1db40cdf9cb25b446ffd15dfd1e3e6f178ae2257.tar.bz2
playbooks-1db40cdf9cb25b446ffd15dfd1e3e6f178ae2257.zip
tasks/docker: Move alpine bootstrap to common tasks
-rw-r--r--roles/common/files/1-cgroup-docker.start (renamed from roles/docker/files/1-cgroup-docker.start)0
-rw-r--r--roles/common/tasks/docker/alpine.yml (renamed from roles/docker/alpine.yml)2
-rw-r--r--roles/docker-registry/main.yml (renamed from roles/docker/alpine-registry.yml)4
3 files changed, 3 insertions, 3 deletions
diff --git a/roles/docker/files/1-cgroup-docker.start b/roles/common/files/1-cgroup-docker.start
index 15c2172..15c2172 100644
--- a/roles/docker/files/1-cgroup-docker.start
+++ b/roles/common/files/1-cgroup-docker.start
diff --git a/roles/docker/alpine.yml b/roles/common/tasks/docker/alpine.yml
index cfb0e78..ce759a4 100644
--- a/roles/docker/alpine.yml
+++ b/roles/common/tasks/docker/alpine.yml
@@ -15,7 +15,7 @@
- name: Copying cgroups mount script to local.d
copy:
- src: 1-cgroup-docker.start
+ src: ../../../common/files/1-cgroup-docker.start
dest: /etc/local.d/1-cgroup-docker.start
mode: '0700'
diff --git a/roles/docker/alpine-registry.yml b/roles/docker-registry/main.yml
index 78091a8..9143d7a 100644
--- a/roles/docker/alpine-registry.yml
+++ b/roles/docker-registry/main.yml
@@ -7,7 +7,7 @@
import_playbook: ../common/tasks/lxc.yml
-- name: Install Docker Registry on Alpine LXC Container
+- name: Installing Docker Registry on Alpine LXC Container
hosts: docker_registry
vars_files:
@@ -16,7 +16,7 @@
tasks:
- name: Including docker bootstrap for alpine
- include: alpine.yml
+ include: ../common/tasks/docker/alpine.yml
- name: Creating docker registry folder
file: