External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-11 10:00:01 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5845 from shanemcd/missing-base-image-deps

Browse Source 
Add packages missing from base images

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot] 2020-02-07 18:54:46 +00:00 committed by GitHub
commit 5decde3f70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,8 +11,11 @@ RUN dnf -y update && \
ansible \
bubblewrap \
curl \
diffutils \
dnf-utils \
gcc \
gcc-c++ \
gettext \
git-core \
glibc-langpack-en \
krb5-workstation \
@ -44,11 +47,11 @@ RUN dnf -y update && \
tmux \
unzip \
vim-minimal \
which \
xmlsec1 \
xmlsec1-devel \
xmlsec1-openssl \
xmlsec1-openssl-devel \
dnf-utils
xmlsec1-openssl-devel
ADD https://github.com/krallin/tini/releases/download/v0.14.0/tini /tini
RUN chmod +x /tini

6
tools/docker-compose/Dockerfile
View File

@ -14,6 +14,8 @@ RUN dnf -y update && \
ansible \
bubblewrap \
curl \
diffutils \
dnf-utils \
gcc \
gcc-c++ \
gettext \
@ -48,11 +50,11 @@ RUN dnf -y update && \
tmux \
unzip \
vim-minimal \
which \
xmlsec1 \
xmlsec1-devel \
xmlsec1-openssl \
xmlsec1-openssl-devel \
dnf-utils
xmlsec1-openssl-devel
# UI tests only, do not put in installer/roles/image_build/templates/Dockerfile.j2
RUN dnf -y install \