External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-23 20:05:03 -02: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
parent 6395d64681 3f57061509
commit 5decde3f70
2 changed files with 9 additions and 4 deletions
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 \ ansible \
bubblewrap \ bubblewrap \
curl \ curl \
diffutils \
dnf-utils \
gcc \ gcc \
gcc-c++ \ gcc-c++ \
gettext \
git-core \ git-core \
glibc-langpack-en \ glibc-langpack-en \
krb5-workstation \ krb5-workstation \
@@ -44,11 +47,11 @@ RUN dnf -y update && \
tmux \ tmux \
unzip \ unzip \
vim-minimal \ vim-minimal \
which \
xmlsec1 \ xmlsec1 \
xmlsec1-devel \ xmlsec1-devel \
xmlsec1-openssl \ xmlsec1-openssl \
xmlsec1-openssl-devel \ xmlsec1-openssl-devel
dnf-utils
ADD https://github.com/krallin/tini/releases/download/v0.14.0/tini /tini ADD https://github.com/krallin/tini/releases/download/v0.14.0/tini /tini
RUN chmod +x /tini RUN chmod +x /tini

6
tools/docker-compose/Dockerfile
View File

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