From 88a0d984478f7cf19b790b1b524d1545dcebb4ff Mon Sep 17 00:00:00 2001 From: "Christian M. Adams" Date: Wed, 13 Jan 2021 15:44:05 -0500 Subject: [PATCH] Run migrations via a task, not in the container * Issue: https://github.com/ansible/awx/issues/9077 * Fixes problem with migrations not completing --- installer/roles/local_docker/tasks/compose.yml | 10 ++++++++++ .../roles/local_docker/templates/docker-compose.yml.j2 | 1 + 2 files changed, 11 insertions(+) diff --git a/installer/roles/local_docker/tasks/compose.yml b/installer/roles/local_docker/tasks/compose.yml index e2f0fc6663..0366a5c0b9 100644 --- a/installer/roles/local_docker/tasks/compose.yml +++ b/installer/roles/local_docker/tasks/compose.yml @@ -36,6 +36,11 @@ register: awx_secret_key - block: + - name: Run migrations in task container + shell: docker-compose run --rm --service-ports task awx-manage migrate --no-input + args: + chdir: "{{ docker_compose_dir }}" + - name: Start the containers docker_compose: project_src: "{{ docker_compose_dir }}" @@ -50,6 +55,11 @@ command: docker exec awx_task '/usr/bin/update-ca-trust' when: awx_compose_config.changed or awx_compose_start.changed + - name: Wait for launch script to create user + wait_for: + timeout: 10 + delegate_to: localhost + - name: Create Preload data command: docker exec awx_task bash -c "/usr/bin/awx-manage create_preload_data" when: create_preload_data|bool diff --git a/installer/roles/local_docker/templates/docker-compose.yml.j2 b/installer/roles/local_docker/templates/docker-compose.yml.j2 index f97e438984..a0b4a59bf0 100644 --- a/installer/roles/local_docker/templates/docker-compose.yml.j2 +++ b/installer/roles/local_docker/templates/docker-compose.yml.j2 @@ -149,6 +149,7 @@ services: {% endfor %} {% endif %} environment: + AWX_SKIP_MIGRATIONS: "1" http_proxy: {{ http_proxy | default('') }} https_proxy: {{ https_proxy | default('') }} no_proxy: {{ no_proxy | default('') }}