diff --git a/docker/CentOS-6-git-builder/Dockerfile b/docker/CentOS-6-git-builder/Dockerfile index 6a7eee89..cba8b97d 100644 --- a/docker/CentOS-6-git-builder/Dockerfile +++ b/docker/CentOS-6-git-builder/Dockerfile @@ -5,12 +5,15 @@ RUN yum -y install epel-release RUN yum -y install git cmake3 make qt5-qtbase-devel gcc \ avahi-compat-libdns_sd-devel gcc-c++ curl-devel \ openssl-devel \ - libXtst-devel libXinerama-devel libICE-devel libXrandr-devel + libXtst-devel libXinerama-devel libICE-devel libXrandr-devel \ + rpm-build # c6 g++ is not CXX14 RUN yum -y install centos-release-scl-rh # devtoolset-3 is enough but one can use devtoolset-N RUN yum -y install devtoolset-3-gcc-c++.x86_64 -RUN git clone https://github.com/debauchee/barrier/ -RUN cd barrier && scl enable devtoolset-3 ./clean_build.sh | tee clean_build.log && tar czvf build.tgz build clean_build.log +#RUN git clone https://github.com/debauchee/barrier/ +RUN git clone https://github.com/truatpasteurdotfr/barrier/ +#RUN cd barrier && scl enable devtoolset-3 ./clean_build.sh | tee clean_build.log && tar czvf build.tgz build clean_build.log +RUN cd barrier && scl enable devtoolset-3 ./build_rpm.sh | tee clean_build.log diff --git a/docker/fedora27-git-builder/Dockerfile b/docker/fedora27-git-builder/Dockerfile new file mode 100644 index 00000000..6665709a --- /dev/null +++ b/docker/fedora27-git-builder/Dockerfile @@ -0,0 +1,12 @@ +FROM fedora:27 + +RUN yum -y update && yum -y upgrade +RUN yum -y install git cmake3 make qt5-qtbase-devel gcc \ + avahi-compat-libdns_sd-devel gcc-c++ curl-devel \ + openssl-devel \ + libXtst-devel libXinerama-devel libICE-devel libXrandr-devel \ + rpm-build + +#RUN git clone https://github.com/debauchee/barrier/ +RUN git clone https://github.com/truatpasteurdotfr/barrier/ +RUN cd barrier && ./build_rpm.sh | tee clean_build.log