Change role to just use build_with_dockerfile

Author: thejsj

ansible/image-builder.yml

@@ -3,7 +3,7 @@
   vars_files:
     - group_vars/alpha-image-builder.yml
   roles:
-  - { role: builder }
+  - { role: build_with_dockerfile }
 
 - hosts: "{{ dock | default('docks') }}"
   vars_files:

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

@@ -91,7 +91,7 @@
 - name: copy dockerfile to build folder
   delegate_to: "{{ builder }}"
   tags: deploy, build
-  when: build_image and use_default_dockerfile is not defined
+  when: build_image
   become: true
   template:
     src: "{{ dockerfile }}"