From 4f40381b4613fa4dac8db168de442d83027a8f4f Mon Sep 17 00:00:00 2001 From: Siva Renganathan Date: Tue, 9 Feb 2021 20:37:11 +0530 Subject: [PATCH] [9273]: Add missing symlinks for awx-manage This fixes the issue addressed in 9273 The symlinks are created on the build container as opposed to the final container causing awx-manage command to break. Signed-off-by: Siva Renganathan --- installer/roles/dockerfile/templates/Dockerfile.j2 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/installer/roles/dockerfile/templates/Dockerfile.j2 b/installer/roles/dockerfile/templates/Dockerfile.j2 index 0364a5a591..edcfbefede 100644 --- a/installer/roles/dockerfile/templates/Dockerfile.j2 +++ b/installer/roles/dockerfile/templates/Dockerfile.j2 @@ -75,7 +75,6 @@ COPY . /tmp/src/ WORKDIR /tmp/src/ RUN make sdist && \ /var/lib/awx/venv/awx/bin/pip install dist/awx-$(cat VERSION).tar.gz -RUN ln -s /var/lib/awx/venv/awx/bin/awx-manage /usr/bin/awx-manage {% endif %} # Final container(s) @@ -173,6 +172,8 @@ RUN dnf --enablerepo=debuginfo -y install python3-debuginfo || : # Copy app from builder COPY --from=builder /var/lib/awx /var/lib/awx +RUN ln -s /var/lib/awx/venv/awx/bin/awx-manage /usr/bin/awx-manage + {%if build_dev|bool %} RUN openssl req -nodes -newkey rsa:2048 -keyout /etc/nginx/nginx.key -out /etc/nginx/nginx.csr \ -subj "/C=US/ST=North Carolina/L=Durham/O=Ansible/OU=AWX Development/CN=awx.localhost" && \