removing registry, registry-mirror and dockerui containers
from the build machine. They are not necessary there.
Change-Id: I67f55658c5160d96c14c2404ebb7cc7fcccde154
diff --git a/ansible/roles/docker/tasks/debian.yml b/ansible/roles/docker/tasks/debian.yml
index f3d8b7e..f590f17 100644
--- a/ansible/roles/docker/tasks/debian.yml
+++ b/ansible/roles/docker/tasks/debian.yml
@@ -48,14 +48,3 @@
state: restarted
when: copy_result|changed or user_result|changed
tags: [docker]
-
-- name: DockerUI is running
- docker:
- image: abh1nav/dockerui
- name: dockerui
- ports: 9000:9000
- privileged: yes
- volumes:
- - /var/run/docker.sock:/var/run/docker.sock
- when: not skip_ui is defined
- tags: [docker]
\ No newline at end of file
diff --git a/ansible/roles/registry/files/mirror-config.yml b/ansible/roles/registry/files/mirror-config.yml
deleted file mode 100644
index 65ff62c..0000000
--- a/ansible/roles/registry/files/mirror-config.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-version: 0.1
-log:
- fields:
- service: registry
-storage:
- cache:
- blobdescriptor: inmemory
- filesystem:
- rootdirectory: /var/lib/registry
- delete:
- enabled: true
-http:
- addr: :5000
- headers:
- X-Content-Type-Options: [nosniff]
-health:
- storagedriver:
- enabled: true
- interval: 10s
- threshold: 3
-
-proxy:
- remoteurl: https://registry-1.docker.io
diff --git a/ansible/roles/registry/tasks/main.yml b/ansible/roles/registry/tasks/main.yml
deleted file mode 100644
index ceb8e46..0000000
--- a/ansible/roles/registry/tasks/main.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-- name: Directories are present
- file:
- path: "{{ item }}"
- state: directory
- recurse: yes
- with_items:
- - /data/registry-mirror/conf
- tags: [registry]
-
-- name: Configuration is copied
- copy:
- src: mirror-config.yml
- dest: /data/registry-mirror/conf/config.yml
- tags: [registry]
-
-- name: Registry container is running
- docker:
- name: registry
- image: registry:2.4.0
- ports: 5000:5000
- volumes:
- - /vagrant/registry:/var/lib/registry/docker/registry
- - /data/registry/conf:/conf
- tags: [registry]
-
-- name: Mirror container is running
- docker:
- name: registry-mirror
- image: registry:2.4.0
- ports: 5001:5000
- volumes:
- - /vagrant/registry-mirror:/var/lib/registry/docker/registry
- - /data/registry-mirror/conf:/conf
- command: /conf/config.yml
- tags: [registry]
diff --git a/scripts/bootstrap_ansible.sh b/scripts/bootstrap_ansible.sh
index eb5f131..ddaa522 100755
--- a/scripts/bootstrap_ansible.sh
+++ b/scripts/bootstrap_ansible.sh
@@ -21,5 +21,5 @@
apt-get install -y software-properties-common
apt-add-repository ppa:ansible/ansible
apt-get update
-apt-get install -y ansible
+apt-get install -y ansible apt-transport-https
cp /cord/build/ansible/ansible.cfg /etc/ansible/ansible.cfg