Skip to content

Commit c8d2262

Browse files
authored
Merge pull request #2275 from rauldsl/optimize-dockerfile-test_suite
Optimize Dockerfile install layer for test_suite
2 parents cb0f519 + 5076ccf commit c8d2262

File tree

1 file changed

+12
-1
lines changed

1 file changed

+12
-1
lines changed

Dockerfiles/test_suite

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,18 @@
1818
#
1919
FROM fedora
2020

21-
RUN dnf install -y git-extras git cmake dbus-devel GConf2-devel libacl-devel libblkid-devel libcap-devel libcurl-devel libgcrypt-devel libselinux-devel libxml2-devel libxslt-devel libattr-devel make openldap-devel pcre-devel perl-XML-Parser perl-XML-XPath perl-devel python3-devel rpm-devel swig bzip2-devel gcc-c++ libyaml-devel xmlsec1-devel xmlsec1-openssl-devel hostname bzip2 lua rpm-build which strace && dnf clean all
21+
RUN dnf -y update && \
22+
dnf -y install \
23+
git-extras git cmake dbus-devel GConf2-devel \
24+
libacl-devel libblkid-devel libcap-devel libcurl-devel \
25+
libgcrypt-devel libselinux-devel libxml2-devel libxslt-devel \
26+
libattr-devel make openldap-devel pcre-devel \
27+
perl-XML-Parser perl-XML-XPath perl-devel \
28+
python3-devel rpm-devel swig bzip2-devel \
29+
gcc-c++ libyaml-devel xmlsec1-devel xmlsec1-openssl-devel \
30+
hostname bzip2 lua rpm-build which strace \
31+
&& dnf clean all \
32+
&& rm -rf /var/cache/dnf
2233

2334
RUN git clone --recurse-submodules https://github.com/OpenSCAP/openscap
2435
RUN echo -e "#!/bin/bash\n\ncd /openscap/build\nif [ -d /openscap/build/tests ]; then\n sleep 1d\n exit 0\nelse\n [ -n \"\$PR\" ] && git pr \$PR\n echo \"Testing branch: \$(git branch --show-current)\"\n cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo ../ && make all\n ctest --output-on-failure\nfi" >> /run.sh

0 commit comments

Comments
 (0)