External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-11 22:49:32 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fix some ansible warnings

Browse Source
This commit is contained in:
Shane McDonald
2019-06-04 20:37:03 -04:00
parent a13b733191
commit 99704af302
1 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
installer/roles/image_build/tasks/main.yml
View File

@@ -43,15 +43,18 @@
- name: Build sdist builder image - name: Build sdist builder image
docker_image: docker_image:
buildargs: build:
http_proxy: "{{ http_proxy | default('') }}" path: "{{ role_path }}/files"
https_proxy: "{{ https_proxy | default('') }}" dockerfile: Dockerfile.sdist
no_proxy: "{{ no_proxy | default('') }}" pull: no
path: "{{ role_path }}/files" args:
dockerfile: Dockerfile.sdist http_proxy: "{{ http_proxy | default('') }}"
https_proxy: "{{ https_proxy | default('') }}"
no_proxy: "{{ no_proxy | default('') }}"
name: awx_sdist_builder name: awx_sdist_builder
tag: "{{ awx_version }}" tag: "{{ awx_version }}"
force: true source: 'build'
force_source: true
delegate_to: localhost delegate_to: localhost
when: use_container_for_build|default(true)|bool when: use_container_for_build|default(true)|bool
@@ -183,29 +186,34 @@
- name: Build base web image - name: Build base web image
docker_image: docker_image:
buildargs: build:
http_proxy: "{{ http_proxy | default('') }}" path: "{{ docker_base_path }}"
https_proxy: "{{ https_proxy | default('') }}" dockerfile: Dockerfile
no_proxy: "{{ no_proxy | default('') }}" pull: no
path: "{{ docker_base_path }}" args:
dockerfile: Dockerfile http_proxy: "{{ http_proxy | default('') }}"
https_proxy: "{{ https_proxy | default('') }}"
no_proxy: "{{ no_proxy | default('') }}"
name: "{{ web_image }}" name: "{{ web_image }}"
tag: "{{ awx_version }}" tag: "{{ awx_version }}"
force: yes source: 'build'
force_source: yes
delegate_to: localhost delegate_to: localhost
- name: Build base task image - name: Build base task image
docker_image: docker_image:
buildargs: build:
http_proxy: "{{ http_proxy | default('') }}" path: "{{ docker_base_path }}"
https_proxy: "{{ https_proxy | default('') }}" dockerfile: Dockerfile.task
no_proxy: "{{ no_proxy | default('') }}" pull: no
path: "{{ docker_base_path }}" args:
dockerfile: Dockerfile.task http_proxy: "{{ http_proxy | default('') }}"
https_proxy: "{{ https_proxy | default('') }}"
no_proxy: "{{ no_proxy | default('') }}"
name: "{{ task_image }}" name: "{{ task_image }}"
tag: "{{ awx_version }}" tag: "{{ awx_version }}"
pull: no source: 'build'
force: yes force_source: yes
delegate_to: localhost delegate_to: localhost
- name: Tag task and web images as latest - name: Tag task and web images as latest