Merge pull request #667 from CodeNow/fix-image-builder-push

Fix tagging of image builder

Author: thejsj

ansible/delta-hosts/hosts

@@ -37,6 +37,9 @@ delta-consul-c
 [user-vault]
 localhost
 
+[user-local]
+localhost
+
 [worker]
 localhost
 

ansible/gamma-hosts/hosts

@@ -41,6 +41,9 @@ gamma-consul-c
 [user-vault]
 localhost
 
+[user-local]
+localhost
+
 [worker]
 localhost
 

ansible/group_vars/alpha-image-builder.yml

@@ -1,8 +1,7 @@
 app_name: image-builder
 name: "{{ app_name }}"
-# namespace (can include "registry.runnable.com:")
-image_builder_docker_namespace: "{{ registry_host }}/runnable/image-builder"
-app_repo: git@github.com:CodeNow/{{ app_name }}.git
+
+repo: git@github.com:CodeNow/{{ name }}.git
 
 # consul values
 consul_values:

ansible/image-builder.yml

@@ -1,10 +1,13 @@
 ---
+- hosts: user-local
+  vars_files:
+    - group_vars/alpha-image-builder.yml
+  roles:
+  - { role: build_with_dockerfile }
+
 - hosts: "{{ dock | default('docks') }}"
   vars_files:
     - group_vars/alpha-image-builder.yml
   roles:
-  - { role: notify, tags: [notify] }
-  - { role: node, tags: [setup]  }
-  - { role: git_repo }
-  - { role: image-builder }
+  - { role: pull-image }
   - { role: consul_value, tags: [consul_value] }

ansible/roles/build_with_dockerfile/tasks/main.yml

@@ -30,9 +30,20 @@
   become: yes
   command: docker build {{ build_args | default("") }} --tag="{{ container_image }}:{{ container_tag }}" "{{ build_dir }}/{{ name }}/repo"
 
+- name: login to registry
+  delegate_to: "{{ builder }}"
+  tags: deploy, build
+  become: yes
+  command: docker login -u {{ registry_username }} -p {{ registry_token }} -e "info@runnable.com" {{ registry_host }}
+
 - name: push docker image
   delegate_to: "{{ builder }}"
   tags: deploy, build
   become: yes
-  ignore_errors: True
   command: docker push {{ container_image }}:{{ container_tag }}
+
+- name: logout of registry
+  delegate_to: "{{ builder }}"
+  tags: deploy, build
+  become: yes
+  command: docker logout {{ registry_host }}

ansible/roles/builder/tasks/main.yml

@@ -31,6 +31,7 @@
 - name: set number of images built
   tags: deploy, build
   set_fact:
+    # Quay IO includes deleted images in this query through the `end_ts` property
     no_images_found: "{{ currently_built_tags|json_query('json.tags')|length == 0  }}"
 
 - name: set number of images built
@@ -192,4 +193,4 @@
   tags: deploy, build
   when: build_image
   become: yes
-  command: docker logout
+  command: docker logout {{ registry_host }}

ansible/roles/image-builder/tasks/main.yml

@@ -0,0 +1,15 @@
+---
+- name: login to registry
+  tags: deploy
+  become: yes
+  command: docker login -u {{ registry_username }} -p {{ registry_token }} -e "info@runnable.com" {{ registry_host }}
+
+- name: pull image
+  tags: deploy
+  become: true
+  command: docker pull {{ container_image }}:{{ container_tag }}
+
+- name: logout of registry
+  tags: deploy
+  become: yes
+  command: docker logout {{ registry_host }}