Merge pull request #33 from pi-hole/new/jq

Add jq and xxd for FTL API tests

ftl-build/aarch64/Dockerfile

@@ -33,6 +33,8 @@ RUN dpkg --add-architecture arm64 \
         binutils \
         cmake \
         libc6-dev:arm64 \
+        xxd \
+        jq \
     && rm -rf /var/lib/apt/lists/*
 
 # Install ghr for GitHub Releases: https://github.com/tcnksm/ghr

ftl-build/armv4t/Dockerfile

@@ -35,6 +35,8 @@ RUN dpkg --add-architecture armel \
         binutils \
         cmake \
         libc6:armel \
+        xxd \
+        jq \
     && rm -rf /var/lib/apt/lists/*
 
 # Install ghr for GitHub Releases: https://github.com/tcnksm/ghr

ftl-build/armv5te/Dockerfile

@@ -33,6 +33,8 @@ RUN dpkg --add-architecture armel \
         binutils \
         cmake \
         libc6:armel \
+        xxd \
+        jq \
     && rm -rf /var/lib/apt/lists/*
 
 # Install ghr for GitHub Releases: https://github.com/tcnksm/ghr

ftl-build/armv6hf/Dockerfile

@@ -17,22 +17,24 @@ ARG termcapversion=1.3.1
 RUN dpkg --add-architecture armel \
     && apt-get update \
     && apt-get install -y --no-install-recommends \
-    wget \
-    git \
-    ca-certificates \
-    curl \
-    make \
-    file \
-    netcat-traditional \
-    ssh \
-    sqlite3 \
-    dnsutils \
-    binutils \
-    cmake \
-    nettle-dev:armel \
-    libcap-dev:armel \
-    libgmp-dev:armel \
-    libc6-dev:armel \
+        wget \
+        git \
+        ca-certificates \
+        curl \
+        make \
+        file \
+        netcat-traditional \
+        ssh \
+        sqlite3 \
+        dnsutils \
+        binutils \
+        cmake \
+        nettle-dev:armel \
+        libcap-dev:armel \
+        libgmp-dev:armel \
+        libc6-dev:armel \
+        xxd \
+        jq \
     && rm -rf /var/lib/apt/lists/*
 
 # Install ghr for GitHub Releases: https://github.com/tcnksm/ghr

ftl-build/armv7hf/Dockerfile

@@ -33,6 +33,8 @@ RUN dpkg --add-architecture armhf \
         binutils \
         cmake \
         libc6:armhf \
+        xxd \
+        jq \
     && rm -rf /var/lib/apt/lists/*
 
 # Install ghr for GitHub Releases: https://github.com/tcnksm/ghr

ftl-build/armv8a/Dockerfile

@@ -33,6 +33,8 @@ RUN dpkg --add-architecture armhf \
         binutils \
         cmake \
         libc6:armhf \
+        xxd \
+        jq \
     && rm -rf /var/lib/apt/lists/*
 
 # Install ghr for GitHub Releases: https://github.com/tcnksm/ghr

ftl-build/x86_32/Dockerfile

@@ -33,6 +33,8 @@ RUN dpkg --add-architecture i386 \
         binutils \
         cmake \
         libc6:i386 \
+        xxd \
+        jq \
     && rm -rf /var/lib/apt/lists/*
 
 # Install ghr for GitHub Releases: https://github.com/tcnksm/ghr

ftl-build/x86_64-musl/Dockerfile

@@ -26,7 +26,9 @@ RUN apk add --no-cache \
         shadow \
         sqlite \
         binutils \
-        cmake
+        cmake \
+        xxd \
+        jq
 
 # Install ghr for GitHub Releases: https://github.com/tcnksm/ghr
 RUN curl -sSL https://github.com/tcnksm/ghr/releases/download/v${ghrversion}/ghr_v${ghrversion}_linux_amd64.tar.gz | \

ftl-build/x86_64/Dockerfile

@@ -31,6 +31,8 @@ RUN apt-get update \
         wget \
         binutils \
         cmake \
+        xxd \
+        jq \
     && rm -rf /var/lib/apt/lists/*
 
 # Install ghr for GitHub Releases: https://github.com/tcnksm/ghr