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

[9273]: Add missing symlinks for awx-manage

Browse Source 
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 <siva.rg@protonmail.com>
This commit is contained in:
Siva Renganathan
2021-02-09 20:37:11 +05:30
parent 2c9ef3bae6
commit 4f40381b46
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
installer/roles/dockerfile/templates/Dockerfile.j2
View File

@@ -75,7 +75,6 @@ COPY . /tmp/src/
WORKDIR /tmp/src/ WORKDIR /tmp/src/
RUN make sdist && \ RUN make sdist && \
/var/lib/awx/venv/awx/bin/pip install dist/awx-$(cat VERSION).tar.gz /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 %} {% endif %}
# Final container(s) # Final container(s)
@@ -173,6 +172,8 @@ RUN dnf --enablerepo=debuginfo -y install python3-debuginfo || :
# Copy app from builder # Copy app from builder
COPY --from=builder /var/lib/awx /var/lib/awx 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 %} {%if build_dev|bool %}
RUN openssl req -nodes -newkey rsa:2048 -keyout /etc/nginx/nginx.key -out /etc/nginx/nginx.csr \ 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" && \ -subj "/C=US/ST=North Carolina/L=Durham/O=Ansible/OU=AWX Development/CN=awx.localhost" && \