From: Jeroen van der Heijden <jeroen@transceptor.technology>
Date: Wed, 15 Jan 2020 08:47:13 +0000 (+0100)
Subject: Fixed docker files
X-Git-Tag: archive/raspbian/2.0.44-1+rpi1~1^2~3^2~5^2~29^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2a2494c1396386ceab0103957b6ace1226c4435a;p=siridb-server.git

Fixed docker files
---

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 4bfb4dc6..bf96afc2 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,19 +1,19 @@
 FROM alpine:latest
 RUN apk update && \
     apk upgrade && \
-    apk add gcc make libuv-dev musl-dev pcre2-dev util-linux-dev linux-headers git && \
+    apk add gcc make libuv-dev musl-dev pcre2-dev yajl-dev util-linux-dev linux-headers git && \
     git clone https://github.com/transceptor-technology/libcleri.git /tmp/libcleri && \
     cd /tmp/libcleri/Release && \
     make all && \
     make install && \
-    git clone https://github.com/transceptor-technology/siridb-server.git /tmp/siridb-server && \
+    git clone https://github.com/SiriDB/siridb-server.git /tmp/siridb-server && \
     cd /tmp/siridb-server/Release && \
     make clean && \
     make
 
 FROM alpine:latest
 RUN apk update && \
-    apk add pcre2 libuv libuuid && \
+    apk add pcre2 libuv libuuid yajl && \
     mkdir -p /etc/siridb && \
     mkdir -p /var/lib/siridb
 COPY --from=0 /tmp/siridb-server/siridb.conf /etc/siridb/siridb.conf
diff --git a/itest/Dockerfile b/itest/Dockerfile
index 804bd1d6..0c13d999 100644
--- a/itest/Dockerfile
+++ b/itest/Dockerfile
@@ -4,6 +4,7 @@ RUN apt-get update && \
         libcleri-dev \
         libuv1-dev \
         libpcre2-dev \
+        libyajl-dev \
         uuid-dev \
         build-essential
 COPY ./main.c ./main.c
@@ -19,7 +20,8 @@ RUN apt-get update && \
     apt-get install -y \
         valgrind \
         libuv1 \
-        libpcre2-8-0 && \
+        libpcre2-8-0 \
+        libyajl2 && \
     wget https://github.com/SiriDB/siridb-admin/releases/download/1.2.0/siridb-admin_1.2.0_linux_amd64.bin -O /usr/local/bin/siridb-admin && \
     chmod +x /usr/local/bin/siridb-admin
 COPY --from=builder ./Release/siridb-server /Release/siridb-server