From 4fd8852f67b6bb8f39840335a989bdbda29a0159 Mon Sep 17 00:00:00 2001 From: Jessica Mack Date: Thu, 26 Jan 2023 11:12:50 -0500 Subject: [PATCH] removed unneeded launch file and Dockerfile change Signed-off-by: Jessica Mack --- .../files/launch_awx_cache_clear.sh | 22 ------------------- .../roles/dockerfile/templates/Dockerfile.j2 | 1 - 2 files changed, 23 deletions(-) delete mode 100644 tools/ansible/roles/dockerfile/files/launch_awx_cache_clear.sh diff --git a/tools/ansible/roles/dockerfile/files/launch_awx_cache_clear.sh b/tools/ansible/roles/dockerfile/files/launch_awx_cache_clear.sh deleted file mode 100644 index 8a1a3e87fd..0000000000 --- a/tools/ansible/roles/dockerfile/files/launch_awx_cache_clear.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env bash -if [ `id -u` -ge 500 ]; then - echo "awx:x:`id -u`:`id -g`:,,,:/var/lib/awx:/bin/bash" >> /tmp/passwd - cat /tmp/passwd > /etc/passwd - rm /tmp/passwd -fi - -if [ -n "${AWX_KUBE_DEVEL}" ]; then - pushd /awx_devel - make awx-link - popd - - export SDB_NOTIFY_HOST=$MY_POD_IP -fi - -set -e - -wait-for-migrations - -awx-manage provision_instance - -exec supervisord -c /etc/supervisord_task.conf \ No newline at end of file diff --git a/tools/ansible/roles/dockerfile/templates/Dockerfile.j2 b/tools/ansible/roles/dockerfile/templates/Dockerfile.j2 index b1a820366e..745a74da34 100644 --- a/tools/ansible/roles/dockerfile/templates/Dockerfile.j2 +++ b/tools/ansible/roles/dockerfile/templates/Dockerfile.j2 @@ -213,7 +213,6 @@ ADD https://raw.githubusercontent.com/containers/libpod/master/contrib/podmanima ADD tools/ansible/roles/dockerfile/files/launch_awx.sh /usr/bin/launch_awx.sh ADD tools/ansible/roles/dockerfile/files/launch_awx_task.sh /usr/bin/launch_awx_task.sh ADD tools/ansible/roles/dockerfile/files/launch_awx_rsyslog.sh /usr/bin/launch_awx_rsyslog.sh -ADD tools/ansible/roles/dockerfile/files/launch_awx_rsyslog.sh /usr/bin/launch_awx_cache_clear.sh ADD tools/ansible/roles/dockerfile/files/uwsgi.ini /etc/tower/uwsgi.ini ADD {{ template_dest }}/supervisor.conf /etc/supervisord.conf ADD {{ template_dest }}/supervisor_task.conf /etc/supervisord_task.conf