Skip to content

Commit ed7cefe

Browse files
Adrian Reberavagin
authored andcommitted
ci: factor out Fedora Rawhide CI setup
To run Fedora Rawhide based aarch64 containers on Drone CI our current Dockerfile setup does not work. This moves the package installation out of the Dockerfile into scripts/ci/prepare-for-fedora-rawhide.sh to be usable in the Dockerfile environment and in the Drone CI environment. Signed-off-by: Adrian Reber <areber@redhat.com>
1 parent 95c4a8b commit ed7cefe

2 files changed

Lines changed: 39 additions & 37 deletions

File tree

Lines changed: 2 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,8 @@
11
ARG CC=gcc
22
ARG ENV1=FOOBAR
33

4-
RUN dnf install -y \
5-
ccache \
6-
diffutils \
7-
findutils \
8-
gcc \
9-
git \
10-
gnutls-devel \
11-
gzip \
12-
iproute \
13-
iptables \
14-
nftables \
15-
nftables-devel \
16-
libaio-devel \
17-
libasan \
18-
libcap-devel \
19-
libnet-devel \
20-
libnl3-devel \
21-
make \
22-
procps-ng \
23-
protobuf-c-devel \
24-
protobuf-devel \
25-
python3-flake8 \
26-
python3-PyYAML \
27-
python3-future \
28-
python3-protobuf \
29-
python3-junit_xml \
30-
redhat-rpm-config \
31-
sudo \
32-
tar \
33-
which \
34-
e2fsprogs \
35-
rubygem-asciidoctor \
36-
kmod
37-
38-
RUN ln -sf python3 /usr/bin/python
39-
ENV PYTHON=python3
4+
COPY scripts/ci/prepare-for-fedora-rawhide.sh /bin/prepare-for-fedora-rawhide.sh
5+
RUN /bin/prepare-for-fedora-rawhide.sh
406

417
COPY . /criu
428
WORKDIR /criu
@@ -49,4 +15,3 @@ RUN mv .ccache /tmp && make mrproper && ccache -sz && \
4915
RUN adduser -u 1000 test
5016

5117
RUN make -C test/zdtm -j $(nproc)
52-
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
#!/bin/bash
2+
set -e -x
3+
4+
dnf install -y \
5+
ccache \
6+
diffutils \
7+
findutils \
8+
gcc \
9+
git \
10+
gnutls-devel \
11+
gzip \
12+
iproute \
13+
iptables \
14+
nftables \
15+
nftables-devel \
16+
libaio-devel \
17+
libasan \
18+
libcap-devel \
19+
libnet-devel \
20+
libnl3-devel \
21+
make \
22+
procps-ng \
23+
protobuf-c-devel \
24+
protobuf-devel \
25+
python3-flake8 \
26+
python3-PyYAML \
27+
python3-future \
28+
python3-protobuf \
29+
python3-junit_xml \
30+
python-unversioned-command \
31+
redhat-rpm-config \
32+
sudo \
33+
tar \
34+
which \
35+
e2fsprogs \
36+
rubygem-asciidoctor \
37+
kmod

0 commit comments

Comments
 (0)