From cf1f60a1b493e23ef053cd1f87c042fae52e7dcd Mon Sep 17 00:00:00 2001 From: Jacek Danecki Date: Tue, 3 Jul 2018 22:05:09 +0200 Subject: [PATCH] ci: run build on Fedora in one container fix for dnf install issue: error: rpmdb: BDB0689 Packages page 465 is on free list with type 7 error: rpmdb: BDB0061 PANIC: Invalid argument Signed-off-by: Jacek Danecki https://github.com/intel/compute-runtime/pull/59 Change-Id: I7ee5afc7b2398feabb5aa2e9c42feae6196ed1be --- scripts/build-fedora27-copr-docker.sh | 1 + scripts/build-fedora28-copr-docker.sh | 1 + scripts/docker/Dockerfile-fedora-27-copr-gcc-7 | 12 ++++++------ scripts/docker/Dockerfile-fedora-28-copr-gcc-8 | 12 ++++++------ 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/scripts/build-fedora27-copr-docker.sh b/scripts/build-fedora27-copr-docker.sh index 1759fcd81a..b787ca061b 100755 --- a/scripts/build-fedora27-copr-docker.sh +++ b/scripts/build-fedora27-copr-docker.sh @@ -21,5 +21,6 @@ git fetch -t git clone ../compute-runtime neo +docker info docker build -f scripts/docker/Dockerfile-fedora-27-copr-gcc-7 -t neo-fedora-27-copr-gcc-7:ci . diff --git a/scripts/build-fedora28-copr-docker.sh b/scripts/build-fedora28-copr-docker.sh index 736f4a30ca..1401795116 100755 --- a/scripts/build-fedora28-copr-docker.sh +++ b/scripts/build-fedora28-copr-docker.sh @@ -21,5 +21,6 @@ git fetch -t git clone ../compute-runtime neo +docker info docker build -f scripts/docker/Dockerfile-fedora-28-copr-gcc-8 -t neo-fedora-28-copr-gcc-8:ci . diff --git a/scripts/docker/Dockerfile-fedora-27-copr-gcc-7 b/scripts/docker/Dockerfile-fedora-27-copr-gcc-7 index e451e0c87c..a74e8ccc87 100644 --- a/scripts/docker/Dockerfile-fedora-27-copr-gcc-7 +++ b/scripts/docker/Dockerfile-fedora-27-copr-gcc-7 @@ -3,11 +3,11 @@ MAINTAINER Jacek Danecki COPY neo /root/neo -RUN dnf install -y gcc-c++ cmake ninja-build git pkg-config -RUN dnf install -y 'dnf-command(copr)' -RUN dnf copr enable -y arturh/intel-opencl -RUN dnf install -y intel-igc-opencl-devel -RUN cd /root; git clone --depth 1 https://github.com/intel/gmmlib gmmlib -RUN mkdir /root/build; cd /root/build ; cmake -G Ninja ../neo; \ +RUN dnf install -y gcc-c++ cmake ninja-build git pkg-config; \ + dnf install -y 'dnf-command(copr)'; \ + dnf copr enable -y arturh/intel-opencl; \ + dnf install -y intel-igc-opencl-devel; \ + cd /root; git clone --depth 1 https://github.com/intel/gmmlib gmmlib; \ + mkdir /root/build; cd /root/build ; cmake -G Ninja ../neo; \ ninja -j `nproc` CMD ["/bin/bash"] diff --git a/scripts/docker/Dockerfile-fedora-28-copr-gcc-8 b/scripts/docker/Dockerfile-fedora-28-copr-gcc-8 index 093a21cb95..ac7ec83d18 100644 --- a/scripts/docker/Dockerfile-fedora-28-copr-gcc-8 +++ b/scripts/docker/Dockerfile-fedora-28-copr-gcc-8 @@ -3,11 +3,11 @@ MAINTAINER Jacek Danecki COPY neo /root/neo -RUN dnf install -y gcc-c++ cmake ninja-build git pkg-config -RUN dnf install -y 'dnf-command(copr)' -RUN dnf copr enable -y arturh/intel-opencl -RUN dnf install -y intel-igc-opencl-devel -RUN cd /root; git clone --depth 1 https://github.com/intel/gmmlib gmmlib -RUN mkdir /root/build; cd /root/build ; cmake -G Ninja ../neo; \ +RUN dnf install -y gcc-c++ cmake ninja-build git pkg-config; \ + dnf install -y 'dnf-command(copr)'; \ + dnf copr enable -y arturh/intel-opencl; \ + dnf install -y intel-igc-opencl-devel; \ + cd /root; git clone --depth 1 https://github.com/intel/gmmlib gmmlib; \ + mkdir /root/build; cd /root/build ; cmake -G Ninja ../neo; \ ninja -j `nproc` CMD ["/bin/bash"]