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

Install subman and set ACL for rhsm.conf for dev

Browse Source
This commit is contained in:
Christian M. Adams
2020-10-22 14:23:22 -04:00
parent 2df924ae78
commit fbde4797f8
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -71,7 +71,6 @@ RUN cd /tmp && make requirements_collections
{% if build_dev|bool %} {% if build_dev|bool %}
ADD requirements/requirements_dev.txt /tmp/requirements ADD requirements/requirements_dev.txt /tmp/requirements
RUN cd /tmp && make requirements_awx_dev requirements_ansible_dev RUN cd /tmp && make requirements_awx_dev requirements_ansible_dev
RUN setfacl -m u:awx:r /etc/rhsm/rhsm.conf
{% endif %} {% endif %}
{% if not build_dev|bool %} {% if not build_dev|bool %}
COPY {{ awx_sdist_file }} /tmp/{{ awx_sdist_file }} COPY {{ awx_sdist_file }} /tmp/{{ awx_sdist_file }}
@@ -100,6 +99,7 @@ RUN dnf -y install \
libX11-xcb \ libX11-xcb \
libXScrnSaver \ libXScrnSaver \
strace \ strace \
subscription-manager \
vim \ vim \
nmap-ncat \ nmap-ncat \
nodejs \ nodejs \
@@ -111,6 +111,7 @@ RUN dnf -y install \
diffutils \ diffutils \
unzip && \ unzip && \
npm install -g n && n 10.15.0 && dnf remove -y nodejs npm install -g n && n 10.15.0 && dnf remove -y nodejs
RUN setfacl -m u:1000:r /etc/rhsm/rhsm.conf
{% endif %} {% endif %}
# Install runtime requirements # Install runtime requirements