From b65ff9edb845b6c756a96fc3013fdf2708497a3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?louiz=E2=80=99?= Date: Sun, 4 Dec 2016 22:56:40 +0100 Subject: =?UTF-8?q?In=20the=20docker=20images,=20use=20port=201113=20for?= =?UTF-8?q?=20charybdis=E2=80=99=20identd=20connection?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/biboumi-test/fedora/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker/biboumi-test/fedora') diff --git a/docker/biboumi-test/fedora/Dockerfile b/docker/biboumi-test/fedora/Dockerfile index ebcb4e4..125c4f2 100644 --- a/docker/biboumi-test/fedora/Dockerfile +++ b/docker/biboumi-test/fedora/Dockerfile @@ -53,7 +53,7 @@ RUN useradd tester RUN dnf install -y automake autoconf flex flex-devel bison libtool-ltdl-devel openssl-devel RUN dnf install -y libtool RUN git clone https://github.com/charybdis-ircd/charybdis.git && cd charybdis -RUN cd /charybdis && git checkout 4f2b9a4 && ./autogen.sh && ./configure --prefix=/home/tester/ircd --bindir=/usr/bin --with-included-boost && make -j8 && make install +RUN cd /charybdis && git checkout 4f2b9a4 && sed s/113/1113/ -i /charybdis/authd/providers/ident.c && ./autogen.sh && ./configure --prefix=/home/tester/ircd --bindir=/usr/bin --with-included-boost && make -j8 && make install RUN chown -R tester:tester /home/tester/ircd RUN rm -rf /charybdis -- cgit v1.2.3 From 6fee8394f021fe5aee459ecbf678cd3a0a42ea32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?louiz=E2=80=99?= Date: Thu, 8 Dec 2016 09:39:43 +0100 Subject: Fix the locales in the docker test images --- docker/biboumi-test/fedora/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'docker/biboumi-test/fedora') diff --git a/docker/biboumi-test/fedora/Dockerfile b/docker/biboumi-test/fedora/Dockerfile index 125c4f2..e61cfe1 100644 --- a/docker/biboumi-test/fedora/Dockerfile +++ b/docker/biboumi-test/fedora/Dockerfile @@ -64,6 +64,8 @@ COPY sonar-scanner-2.8 /home/tester/sonar-scanner RUN dnf install -y which java-1.8.0-openjdk +ENV LC_ALL C.UTF-8 + WORKDIR /home/tester USER tester -- cgit v1.2.3 From 16feed7e9e3c215625a62d444d7fa62c2a707c28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?louiz=E2=80=99?= Date: Sat, 24 Dec 2016 15:31:53 +0100 Subject: Update the DockerFiles to include openssl --- docker/biboumi-test/fedora/Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'docker/biboumi-test/fedora') diff --git a/docker/biboumi-test/fedora/Dockerfile b/docker/biboumi-test/fedora/Dockerfile index e61cfe1..14e752f 100644 --- a/docker/biboumi-test/fedora/Dockerfile +++ b/docker/biboumi-test/fedora/Dockerfile @@ -57,15 +57,14 @@ RUN cd /charybdis && git checkout 4f2b9a4 && sed s/113/1113/ -i /charybdis/authd RUN chown -R tester:tester /home/tester/ircd RUN rm -rf /charybdis -RUN su - tester -c "echo export LANG=en_GB.utf-8 >> /home/tester/.bashrc" - COPY coverity /home/tester/coverity COPY sonar-scanner-2.8 /home/tester/sonar-scanner RUN dnf install -y which java-1.8.0-openjdk +RUN yes "" | openssl req -nodes -x509 -newkey rsa:4096 -keyout /home/tester/ircd/etc/ssl.key -out /home/tester/ircd/etc/ssl.pem + ENV LC_ALL C.UTF-8 WORKDIR /home/tester USER tester - -- cgit v1.2.3 From eecb95352e4d903dd72501fd69a5676928ee8aae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?louiz=E2=80=99?= Date: Wed, 4 Jan 2017 01:53:53 +0100 Subject: Add libasan and libubsan in the test docker images --- docker/biboumi-test/fedora/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'docker/biboumi-test/fedora') diff --git a/docker/biboumi-test/fedora/Dockerfile b/docker/biboumi-test/fedora/Dockerfile index 14e752f..4d82c7d 100644 --- a/docker/biboumi-test/fedora/Dockerfile +++ b/docker/biboumi-test/fedora/Dockerfile @@ -19,6 +19,8 @@ RUN dnf install -y libidn-devel RUN dnf install -y uuid-devel RUN dnf install -y systemd-devel RUN dnf install -y pandoc +RUN dnf install -y libasan +RUN dnf install -y libubsan # Needed to run tests RUN dnf install -y git -- cgit v1.2.3 From 5b56007828f20c763df3f36ceed809188880663e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?louiz=E2=80=99?= Date: Fri, 6 Jan 2017 22:58:18 +0100 Subject: Use udns instead of c-ares fix #3226 --- docker/biboumi-test/fedora/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker/biboumi-test/fedora') diff --git a/docker/biboumi-test/fedora/Dockerfile b/docker/biboumi-test/fedora/Dockerfile index 4d82c7d..e0d206b 100644 --- a/docker/biboumi-test/fedora/Dockerfile +++ b/docker/biboumi-test/fedora/Dockerfile @@ -9,7 +9,7 @@ RUN dnf update -y RUN dnf install -y gcc-c++ RUN dnf install -y clang RUN dnf install -y valgrind -RUN dnf install -y c-ares-devel +RUN dnf install -y udns-devel RUN dnf install -y sqlite-devel RUN dnf install -y libuuid-devel RUN dnf install -y cmake -- cgit v1.2.3 From 3699463e2ad70c88d8b5a2b56baa4186f1fce02e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?louiz=E2=80=99?= Date: Tue, 17 Jan 2017 23:42:02 +0100 Subject: Refactor and split the Dockerfiles, to build a base without litesql --- docker/biboumi-test/fedora/Dockerfile | 66 +----------------------------- docker/biboumi-test/fedora/Dockerfile.base | 58 ++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 64 deletions(-) create mode 100644 docker/biboumi-test/fedora/Dockerfile.base (limited to 'docker/biboumi-test/fedora') diff --git a/docker/biboumi-test/fedora/Dockerfile b/docker/biboumi-test/fedora/Dockerfile index e0d206b..45dbe76 100644 --- a/docker/biboumi-test/fedora/Dockerfile +++ b/docker/biboumi-test/fedora/Dockerfile @@ -1,72 +1,10 @@ # This Dockerfile creates a docker image suitable to run biboumi’s build and # tests. For example, it can be used on with gitlab-ci. -FROM docker.io/fedora:latest - -RUN dnf update -y - -# Needed to build biboumi -RUN dnf install -y gcc-c++ -RUN dnf install -y clang -RUN dnf install -y valgrind -RUN dnf install -y udns-devel -RUN dnf install -y sqlite-devel -RUN dnf install -y libuuid-devel -RUN dnf install -y cmake -RUN dnf install -y make -RUN dnf install -y expat-devel -RUN dnf install -y libidn-devel -RUN dnf install -y uuid-devel -RUN dnf install -y systemd-devel -RUN dnf install -y pandoc -RUN dnf install -y libasan -RUN dnf install -y libubsan - -# Needed to run tests -RUN dnf install -y git -RUN dnf install -y fedora-packager python3-lxml -RUN dnf install -y lcov - -# To be able to create the RPM -RUN dnf install -y rpmdevtools - -# Install botan -RUN git clone https://github.com/randombit/botan.git -RUN cd botan && ./configure.py --prefix=/usr && make -j8 && make install -RUN rm -rf /botan +FROM docker.louiz.org/biboumi-test-fedora-base # Install litesql -RUN git clone git://git.louiz.org/litesql -RUN mkdir /litesql/build && cd /litesql/build && cmake .. -DCMAKE_INSTALL_PREFIX=/usr && make -j8 -RUN cd /litesql/build && make install -RUN rm -rf /litesql - -RUN ldconfig - -# Install slixmpp, for e2e tests -RUN git clone git://git.louiz.org/slixmpp -RUN pip3 install pyasn1 -RUN dnf install -y python3-devel -RUN cd slixmpp && python3 setup.py build && python3 setup.py install - -RUN useradd tester - -# Install charybdis, for e2e tests -RUN dnf install -y automake autoconf flex flex-devel bison libtool-ltdl-devel openssl-devel -RUN dnf install -y libtool -RUN git clone https://github.com/charybdis-ircd/charybdis.git && cd charybdis -RUN cd /charybdis && git checkout 4f2b9a4 && sed s/113/1113/ -i /charybdis/authd/providers/ident.c && ./autogen.sh && ./configure --prefix=/home/tester/ircd --bindir=/usr/bin --with-included-boost && make -j8 && make install -RUN chown -R tester:tester /home/tester/ircd -RUN rm -rf /charybdis - -COPY coverity /home/tester/coverity -COPY sonar-scanner-2.8 /home/tester/sonar-scanner - -RUN dnf install -y which java-1.8.0-openjdk - -RUN yes "" | openssl req -nodes -x509 -newkey rsa:4096 -keyout /home/tester/ircd/etc/ssl.key -out /home/tester/ircd/etc/ssl.pem - -ENV LC_ALL C.UTF-8 +RUN git clone git://git.louiz.org/litesql && mkdir /litesql/build && cd /litesql/build && cmake .. -DCMAKE_INSTALL_PREFIX=/usr && make -j8 && cd /litesql/build && make install && ldconfig && rm -rf /litesql WORKDIR /home/tester USER tester diff --git a/docker/biboumi-test/fedora/Dockerfile.base b/docker/biboumi-test/fedora/Dockerfile.base new file mode 100644 index 0000000..0fd3095 --- /dev/null +++ b/docker/biboumi-test/fedora/Dockerfile.base @@ -0,0 +1,58 @@ +# This Dockerfile creates a docker image suitable to run biboumi’s build and +# tests. For example, it can be used on with gitlab-ci. + +FROM docker.io/fedora:latest + +ENV LC_ALL C.UTF-8 + +RUN dnf --refresh install -y\ + gcc-c++\ + clang\ + valgrind\ + udns-devel\ + sqlite-devel\ + libuuid-devel\ + cmake\ + make\ + expat-devel\ + libidn-devel\ + uuid-devel\ + systemd-devel\ + pandoc\ + libasan\ + libubsan\ + git\ + fedora-packager\ + python3-lxml\ + lcov\ + rpmdevtools\ + python3-devel\ + automake\ + autoconf\ + flex\ + flex-devel\ + bison\ + libtool-ltdl-devel\ + libtool\ + openssl-devel\ + which\ + java-1.8.0-openjdk\ + && dnf clean all + +# Install botan +RUN git clone https://github.com/randombit/botan.git && cd botan && ./configure.py --prefix=/usr && make -j8 && make install && ldconfig && rm -rf /botan + +# Install slixmpp, for e2e tests +RUN git clone git://git.louiz.org/slixmpp && pip3 install pyasn1 && cd slixmpp && python3 setup.py build && python3 setup.py install + +RUN useradd tester + +# Install charybdis, for e2e tests +RUN git clone https://github.com/charybdis-ircd/charybdis.git && cd charybdis && cd /charybdis && git checkout 4f2b9a4 && sed s/113/1113/ -i /charybdis/authd/providers/ident.c && ./autogen.sh && ./configure --prefix=/home/tester/ircd --bindir=/usr/bin --with-included-boost && make -j8 && make install && rm -rf /charybdis + +RUN chown -R tester:tester /home/tester/ircd + +RUN yes "" | openssl req -nodes -x509 -newkey rsa:4096 -keyout /home/tester/ircd/etc/ssl.key -out /home/tester/ircd/etc/ssl.pem + +COPY coverity /home/tester/coverity +COPY sonar-scanner-2.8 /home/tester/sonar-scanner -- cgit v1.2.3 From 11c63ebceb07d9b65ed16182139477ea79739c12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?louiz=E2=80=99?= Date: Mon, 6 Mar 2017 01:22:51 +0100 Subject: Add the gcrypt dependency to the biboumi-test docker images --- docker/biboumi-test/fedora/Dockerfile.base | 1 + 1 file changed, 1 insertion(+) (limited to 'docker/biboumi-test/fedora') diff --git a/docker/biboumi-test/fedora/Dockerfile.base b/docker/biboumi-test/fedora/Dockerfile.base index 0fd3095..dd536e5 100644 --- a/docker/biboumi-test/fedora/Dockerfile.base +++ b/docker/biboumi-test/fedora/Dockerfile.base @@ -12,6 +12,7 @@ RUN dnf --refresh install -y\ udns-devel\ sqlite-devel\ libuuid-devel\ + libgcrypt-devel\ cmake\ make\ expat-devel\ -- cgit v1.2.3 From 5d0bae65975eb7cb92543f13554f95386b50467e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?louiz=E2=80=99?= Date: Tue, 21 Mar 2017 15:01:28 +0100 Subject: Re-add the c-ares lib in the docker test images --- docker/biboumi-test/fedora/Dockerfile.base | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker/biboumi-test/fedora') diff --git a/docker/biboumi-test/fedora/Dockerfile.base b/docker/biboumi-test/fedora/Dockerfile.base index dd536e5..20984a2 100644 --- a/docker/biboumi-test/fedora/Dockerfile.base +++ b/docker/biboumi-test/fedora/Dockerfile.base @@ -10,6 +10,7 @@ RUN dnf --refresh install -y\ clang\ valgrind\ udns-devel\ + c-ares-devel\ sqlite-devel\ libuuid-devel\ libgcrypt-devel\ @@ -56,4 +57,3 @@ RUN chown -R tester:tester /home/tester/ircd RUN yes "" | openssl req -nodes -x509 -newkey rsa:4096 -keyout /home/tester/ircd/etc/ssl.key -out /home/tester/ircd/etc/ssl.pem COPY coverity /home/tester/coverity -COPY sonar-scanner-2.8 /home/tester/sonar-scanner -- cgit v1.2.3