From 488c36f22e52b1b3f355af300c75cce201e3bc49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?louiz=E2=80=99?= Date: Tue, 1 Aug 2017 22:00:34 +0200 Subject: Docker: run the openssl commands as the tester user, for permission issues --- docker/biboumi-test/debian/Dockerfile | 3 ++- docker/biboumi-test/fedora/Dockerfile | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'docker') diff --git a/docker/biboumi-test/debian/Dockerfile b/docker/biboumi-test/debian/Dockerfile index 232a585..b11df96 100644 --- a/docker/biboumi-test/debian/Dockerfile +++ b/docker/biboumi-test/debian/Dockerfile @@ -54,7 +54,8 @@ RUN git clone https://github.com/charybdis-ircd/charybdis.git && cd charybdis && RUN chown -R tester:tester /home/tester/ircd +USER tester + RUN yes "" | openssl req -nodes -x509 -newkey rsa:4096 -keyout /home/tester/ircd/etc/ssl.key -out /home/tester/ircd/etc/ssl.pem WORKDIR /home/tester -USER tester diff --git a/docker/biboumi-test/fedora/Dockerfile b/docker/biboumi-test/fedora/Dockerfile index 384fd51..8ff418c 100644 --- a/docker/biboumi-test/fedora/Dockerfile +++ b/docker/biboumi-test/fedora/Dockerfile @@ -54,9 +54,10 @@ RUN git clone https://github.com/charybdis-ircd/charybdis.git && cd charybdis && RUN chown -R tester:tester /home/tester/ircd +USER tester + 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 WORKDIR /home/tester -USER tester -- cgit v1.2.3 From 765e07d61f051bb001536f38124c3bfa353f70de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?louiz=E2=80=99?= Date: Tue, 1 Aug 2017 22:01:23 +0200 Subject: Fix the conf in the alpine docker image --- docker/biboumi/alpine/biboumi.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docker') diff --git a/docker/biboumi/alpine/biboumi.cfg b/docker/biboumi/alpine/biboumi.cfg index 98c5a9f..841b5e5 100644 --- a/docker/biboumi/alpine/biboumi.cfg +++ b/docker/biboumi/alpine/biboumi.cfg @@ -1,6 +1,6 @@ -xmpp_server_ip=127.0.0.1 +xmpp_server_ip=xmpp port=5347 db_name=/var/lib/biboumi/biboumi.sqlite -hostname=xmpp +hostname= password= admin= -- cgit v1.2.3 From 369cf51968d9401cc52cd871007ca77ffc50f4ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?louiz=E2=80=99?= Date: Tue, 1 Aug 2017 22:01:44 +0200 Subject: Debian now includes libasan3 instead of 1 --- docker/biboumi-test/debian/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker') diff --git a/docker/biboumi-test/debian/Dockerfile b/docker/biboumi-test/debian/Dockerfile index b11df96..3a1c1a7 100644 --- a/docker/biboumi-test/debian/Dockerfile +++ b/docker/biboumi-test/debian/Dockerfile @@ -23,7 +23,7 @@ RUN apt install -y g++\ uuid-dev\ libsystemd-dev\ pandoc\ - libasan1\ + libasan3\ libubsan0\ git\ python3-lxml\ -- cgit v1.2.3