From 1e33d85dea2ac11fd5c933cb34d8d4c363032e2f Mon Sep 17 00:00:00 2001 From: "Tru Huynh (pasteur.fr)" Date: Fri, 9 Mar 2018 17:44:17 +0100 Subject: [PATCH] docker recipes --- docker/CentOS-6-git-builder/Dockerfile | 16 +++++++++++++ docker/CentOS-7-release-builder/Dockerfile | 16 +++++++++++++ docker/debian9-git-builder/Dockerfile | 24 ++++++++++++++++++++ docker/debian9-release-builder/Dockerfile | 26 ++++++++++++++++++++++ 4 files changed, 82 insertions(+) create mode 100644 docker/CentOS-6-git-builder/Dockerfile create mode 100644 docker/CentOS-7-release-builder/Dockerfile create mode 100644 docker/debian9-git-builder/Dockerfile create mode 100644 docker/debian9-release-builder/Dockerfile diff --git a/docker/CentOS-6-git-builder/Dockerfile b/docker/CentOS-6-git-builder/Dockerfile new file mode 100644 index 00000000..6a7eee89 --- /dev/null +++ b/docker/CentOS-6-git-builder/Dockerfile @@ -0,0 +1,16 @@ +FROM centos:centos6 + +RUN yum -y update && yum -y upgrade +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 + +# 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 diff --git a/docker/CentOS-7-release-builder/Dockerfile b/docker/CentOS-7-release-builder/Dockerfile new file mode 100644 index 00000000..2ef7c3c2 --- /dev/null +++ b/docker/CentOS-7-release-builder/Dockerfile @@ -0,0 +1,16 @@ +FROM centos:centos7 + +RUN yum -y update && yum -y upgrade +RUN yum -y install epel-release +RUN yum -y install 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 \ + wget rpm-build alien + +# during the testing period using truatpasteurdotfr/barrier pre-released tarball +# final version should use the https://github.com/debauchee/barrier release versions +RUN wget https://github.com/truatpasteurdotfr/barrier/archive/v2.0.0-RC2.tar.gz && rpmbuild -ta v2.0.0-RC2.tar.gz | tee rpmbuild.log +# quick and dirty conversion to debian, should be ok for stretch amd64 +RUN alien -d /root/rpmbuild/RPMS/x86_64/barrier-2.0.0-1.el7.centos.x86_64.rpm +RUN tar czvf rpmbuild.tgz /root/rpmbuild rpmbuild.log barrier_*.deb diff --git a/docker/debian9-git-builder/Dockerfile b/docker/debian9-git-builder/Dockerfile new file mode 100644 index 00000000..5959e2a7 --- /dev/null +++ b/docker/debian9-git-builder/Dockerfile @@ -0,0 +1,24 @@ +FROM debian:9 +## root@765ebcab56d1:~# cat /etc/apt/sources.list +## #deb http://deb.debian.org/debian stretch main +## #deb http://deb.debian.org/debian stretch-updates main +## deb http://cdn-fastly.deb.debian.org/debian stretch main +## deb http://cdn-fastly.deb.debian.org/debian stretch-updates main +## deb http://security.debian.org stretch/updates main +## +RUN sed -i -e 's,http://deb.debian.org,http://cdn-fastly.deb.debian.org,g' /etc/apt/sources.list +RUN apt-get update && apt-get -y upgrade +RUN apt-get -y install \ +build-essential cmake qt5-default \ +git \ +libxtst-dev libxinerama-dev libice-dev libxrandr-dev \ +libavahi-compat-libdnssd-dev \ +libcurl4-openssl-dev \ +libssl1.0-dev +#libssl-dev is causing these warnings -> using libssl1.0-dev instead +#/usr/bin/ld: warning: libssl.so.1.0.2, needed by /usr/lib/gcc/x86_64-linux-gnu/6/../../../x86_64-linux-gnu/libcurl.so, may conflict with libssl.so.1.1 +#/usr/bin/ld: warning: libcrypto.so.1.0.2, needed by /usr/lib/gcc/x86_64-linux-gnu/6/../../../x86_64-linux-gnu/libcurl.so, may conflict with libcrypto.so.1.1 +# +RUN git clone https://github.com/debauchee/barrier/ +RUN cd barrier && ./clean_build.sh | tee clean_build.log && tar czvf build.tgz build clean_build.log + diff --git a/docker/debian9-release-builder/Dockerfile b/docker/debian9-release-builder/Dockerfile new file mode 100644 index 00000000..e93cf17f --- /dev/null +++ b/docker/debian9-release-builder/Dockerfile @@ -0,0 +1,26 @@ +FROM debian:9 +## root@765ebcab56d1:~# cat /etc/apt/sources.list +## #deb http://deb.debian.org/debian stretch main +## #deb http://deb.debian.org/debian stretch-updates main +## deb http://cdn-fastly.deb.debian.org/debian stretch main +## deb http://cdn-fastly.deb.debian.org/debian stretch-updates main +## deb http://security.debian.org stretch/updates main +## +RUN sed -i -e 's,http://deb.debian.org,http://cdn-fastly.deb.debian.org,g' /etc/apt/sources.list +RUN apt-get update && apt-get -y upgrade +RUN apt-get -y install \ +build-essential cmake qt5-default \ +wget \ +libxtst-dev libxinerama-dev libice-dev libxrandr-dev \ +libavahi-compat-libdnssd-dev \ +libcurl4-openssl-dev \ +libssl1.0-dev +#libssl-dev is causing these warnings -> using libssl1.0-dev instead +#/usr/bin/ld: warning: libssl.so.1.0.2, needed by /usr/lib/gcc/x86_64-linux-gnu/6/../../../x86_64-linux-gnu/libcurl.so, may conflict with libssl.so.1.1 +#/usr/bin/ld: warning: libcrypto.so.1.0.2, needed by /usr/lib/gcc/x86_64-linux-gnu/6/../../../x86_64-linux-gnu/libcurl.so, may conflict with libcrypto.so.1.1 +# +RUN wget https://github.com/truatpasteurdotfr/barrier/archive/v2.0.0-RC2.tar.gz && tar xzvf v2.0.0-RC2.tar.gz +RUN cd barrier-2.0.0-RC2 && cp dist/rpm/build_env.sh . && ./clean_build.sh | tee clean_build.log && tar czvf build.tgz build clean_build.log +# during the testing period using truatpasteurdotfr/barrier pre-released tarball +# final version should use the https://github.com/debauchee/barrier release versions +#RUN wget https://github.com/truatpasteurdotfr/barrier/archive/v2.0.0-RC2.tar.gz && rpmbuild -ta v2.0.0-RC2.tar.gz | tee rpmbuild.log