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

Merge pull request #9121 from shanemcd/devel

Browse Source 
Dont fail image builds because of debuginfo repo problems

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2021-01-20 21:12:37 +00:00
committed by GitHub
parent 8a7c714613 54e1a802c5
commit 41a855fa6a
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
installer/roles/image_build/templates/Dockerfile.j2
View File

@@ -148,7 +148,7 @@ RUN cd /usr/local/bin && \
{% if build_dev|bool %} {% if build_dev|bool %}
# Install development/test requirements # Install development/test requirements
RUN dnf --enablerepo=debuginfo -y install \ RUN dnf -y install \
gdb \ gdb \
gtk3 \ gtk3 \
gettext \ gettext \
@@ -162,13 +162,17 @@ RUN dnf --enablerepo=debuginfo -y install \
nss \ nss \
make \ make \
patch \ patch \
python3-debuginfo \
socat \ socat \
tmux \ tmux \
wget \ wget \
diffutils \ diffutils \
unzip && \ unzip && \
npm install -g n && n 14.15.1 && dnf remove -y nodejs npm install -g n && n 14.15.1 && dnf remove -y nodejs
# This package randomly fails to download.
# It is nice to have in the dev env, but not necessary.
# Add it back to the list above if the repo ever straighten up.
RUN dnf --enablerepo=debuginfo -y install python3-debuginfo || :
{% endif %} {% endif %}
# Copy app from builder # Copy app from builder