diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2016-12-21 21:25:09 +0100 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2016-12-21 21:25:09 +0100 |
| commit | f820d86aadb7a5473bcc0a0a3669732ab0182555 (patch) | |
| tree | a6a673c444ea3df75fe0a5d53e905030c2f617ce /docker | |
| parent | eda4b75b1cff83336e87da90efca9fd6b4ced2c7 (diff) | |
| parent | 9634cdaba2e5d2343fcbc1f07264d55609640273 (diff) | |
| download | biboumi-upstream/4.0.tar.gz biboumi-upstream/4.0.tar.bz2 biboumi-upstream/4.0.tar.xz biboumi-upstream/4.0.zip | |
New upstream version 4.0upstream/4.0
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/biboumi-test/debian/Dockerfile | 6 | ||||
| -rw-r--r-- | docker/biboumi-test/fedora/Dockerfile | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/docker/biboumi-test/debian/Dockerfile b/docker/biboumi-test/debian/Dockerfile index f2a26ea..9aac3ec 100644 --- a/docker/biboumi-test/debian/Dockerfile +++ b/docker/biboumi-test/debian/Dockerfile @@ -39,6 +39,8 @@ RUN rm -rf /litesql RUN ldconfig # Install slixmpp, for e2e tests +RUN git clone https://github.com/saghul/aiodns.git +RUN cd aiodns && python3 setup.py build && python3 setup.py install RUN apt install -y python3-pip RUN git clone git://git.louiz.org/slixmpp RUN pip3 install pyasn1 @@ -48,10 +50,10 @@ RUN cd slixmpp && python3 setup.py build && python3 setup.py install RUN useradd tester -m # Install charybdis, for e2e tests -RUN apt install -y automake autoconf flex bison libltdl-dev openssl +RUN apt install -y automake autoconf flex bison libltdl-dev openssl zlib1g-dev RUN apt install -y libtool RUN git clone https://github.com/charybdis-ircd/charybdis.git && cd charybdis -RUN cd /charybdis && ./autogen.sh && ./configure --prefix=/home/tester/ircd --bindir=/usr/bin && make -j8 && make install +RUN cd /charybdis && git checkout 4f2b9a4 && ./autogen.sh && ./configure --prefix=/home/tester/ircd --bindir=/usr/bin && make -j8 && make install RUN chown -R tester:tester /home/tester/ircd RUN rm -rf /charybdis diff --git a/docker/biboumi-test/fedora/Dockerfile b/docker/biboumi-test/fedora/Dockerfile index 3c48645..ebcb4e4 100644 --- a/docker/biboumi-test/fedora/Dockerfile +++ b/docker/biboumi-test/fedora/Dockerfile @@ -53,12 +53,17 @@ 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 && ./autogen.sh && ./configure --prefix=/home/tester/ircd --bindir=/usr/bin && make -j8 && make install +RUN cd /charybdis && git checkout 4f2b9a4 && ./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 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 + WORKDIR /home/tester USER tester |