Merge pull request #26311 from tchaikov/wip-docker-fc-29

tests: update Dockerfile to support fc-29

Reviewed-By: Neha Ojha <nojha@redhat.com>
This commit is contained in:
Kefu Chai 2019-02-08 14:37:51 +08:00 committed by GitHub
commit 92a7a3f6f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 2 deletions

View File

@ -22,8 +22,8 @@ FROM fedora:%%os_version%%
COPY install-deps.sh /root/
COPY ceph.spec.in /root/
# build dependencies
RUN yum install -y which ; cd /root ; ./install-deps.sh
RUN dnf install -y which ; cd /root ; ./install-deps.sh
# development tools
# nc is required to run make check on firefly only (giant+ do not use nc)
RUN yum install -y ccache valgrind gdb git python-virtualenv gdisk kpartx jq sudo xmlstarlet parted nc
RUN dnf install -y ccache valgrind gdb git python-virtualenv gdisk kpartx jq sudo xmlstarlet parted nc
RUN if test %%USER%% != root ; then useradd -M --uid %%user_id%% %%USER%% && echo '%%USER%% ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers ; fi