mirror of
https://github.com/ansible/awx.git
synced 2026-03-17 00:47:29 -02:30
Remove image push logic from installer roles
I’m going to be reusing this code on the Tower side, and I’m trying to refactor some of the AWX specific bits out. There will probably be more to come, but this is a good start.
This commit is contained in:
@@ -89,11 +89,11 @@
|
||||
|
||||
- name: Set awx_web image name
|
||||
set_fact:
|
||||
awx_web_image: "{{ awx_web_image|default('awx_web') }}"
|
||||
web_image: "{{ web_image|default('awx_web') }}"
|
||||
|
||||
- name: Set awx_task image name
|
||||
set_fact:
|
||||
awx_task_image: "{{ awx_task_image|default('awx_task') }}"
|
||||
task_image: "{{ task_image|default('awx_task') }}"
|
||||
|
||||
- name: Ensure directory exists
|
||||
file:
|
||||
@@ -195,7 +195,7 @@
|
||||
no_proxy: "{{ no_proxy | default('') }}"
|
||||
path: "{{ docker_base_path }}"
|
||||
dockerfile: Dockerfile
|
||||
name: "{{ awx_web_image }}"
|
||||
name: "{{ web_image }}"
|
||||
tag: "{{ awx_version }}"
|
||||
delegate_to: localhost
|
||||
|
||||
@@ -207,11 +207,17 @@
|
||||
no_proxy: "{{ no_proxy | default('') }}"
|
||||
path: "{{ docker_base_path }}"
|
||||
dockerfile: Dockerfile.task
|
||||
name: "{{ awx_task_image }}"
|
||||
name: "{{ task_image }}"
|
||||
tag: "{{ awx_version }}"
|
||||
pull: no
|
||||
delegate_to: localhost
|
||||
|
||||
- name: Tag task and web images as latest
|
||||
command: "docker tag {{ item }}:{{ awx_version }} {{ item }}:latest"
|
||||
with_items:
|
||||
- "{{ task_image }}"
|
||||
- "{{ web_image }}"
|
||||
|
||||
- name: Clean docker base directory
|
||||
file:
|
||||
path: "{{ docker_base_path }}"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
FROM {{ awx_web_image }}:{{ awx_version }}
|
||||
FROM {{ web_image }}:{{ awx_version }}
|
||||
USER 0
|
||||
RUN sudo yum -y remove nginx
|
||||
USER 1000
|
||||
|
||||
Reference in New Issue
Block a user