pi-hole · DL6ER · Oct 14, 2020 · Oct 13, 2020 · Oct 13, 2020 · Oct 13, 2020
diff --git a/.github/workflows/image-builds.yaml b/.github/workflows/image-builds.yaml
@@ -28,6 +28,7 @@ jobs:
           - ftl-build_armv5te
           - ftl-build_armv6hf
           - ftl-build_armv7hf
+          - ftl-build_armv8a
           - ftl-build_x86_32
           - ftl-build_x86_64
           - ftl-build_x86_64-musl

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -45,6 +45,11 @@ services:
     build:
       context: ftl-build/armv7hf
 
+  ftl-build_armv8a:
+    image: pihole/ftl-build:armv8a
+    build:
+      context: ftl-build/armv8a
+
   ftl-build_x86_32:
     image: pihole/ftl-build:x86_32
     build:

diff --git a/ftl-build/aarch64/Dockerfile b/ftl-build/aarch64/Dockerfile
@@ -1,4 +1,9 @@
-FROM debian:stretch
+FROM debian:buster
+
+# For FTL test compilation
+ARG CIRCLE_JOB="aarch64"
+ARG CIRCLE_TAG="test-build"
+ARG BRANCH="special/CI_development"
 
 # ghr 0.13.0 2019-09-16
 ARG ghrversion=0.13.0
@@ -55,6 +60,12 @@ RUN curl -sSL https://ftl.pi-hole.net/libraries/readline-${readlineversion}.tar.
     && cd .. \
     && rm -r readline-${readlineversion}
 
-# Uncomment the following line to test-compile FTL master during docker container development
-#RUN git clone https://github.com/pi-hole/FTL.git && cd FTL && git checkout development \
-#    && bash build.sh -DLUA_READLINE=true && readelf -A ./pihole-FTL
+# Test compile FTL's development branch, the result is removed from the final container
+# We accept errors in the test step to be able to update the arch_tests if a change is intended
+RUN git clone https://github.com/pi-hole/FTL.git \
+    && cd FTL \
+    && git checkout "${BRANCH}" \
+    && bash .circleci/build-CI.sh "${STATIC}" "${BRANCH}" "${CIRCLE_TAG}" "${CIRCLE_JOB}" \
+    && bash test/arch_test.sh \
+    && cd .. \
+    && rm -r FTL
diff --git a/ftl-build/armv4t/Dockerfile b/ftl-build/armv4t/Dockerfile
@@ -1,9 +1,15 @@
 # Note that this has to stay at stretch as buster removed ARMv4T compliance
 FROM debian:stretch
 
+# For FTL test compilation
+ARG CIRCLE_JOB="armv4t"
+ARG CIRCLE_TAG="test-build"
+ARG BRANCH="special/CI_development"
+
 # ghr 0.13.0 2019-09-16
 ARG ghrversion=0.13.0
 
+ARG idnversion=1.36
 ARG readlineversion=8.0
 ARG termcapversion=1.3.1
 
@@ -39,6 +45,13 @@ RUN curl -sSL https://github.com/tcnksm/ghr/releases/download/v${ghrversion}/ghr
 ENV CC "arm-linux-gnueabi-gcc -isystem /usr/local/include"
 RUN ln -s /usr/arm-linux-gnueabi/lib/libm.so /usr/local/lib/
 
+RUN curl -sSL https://ftl.pi-hole.net/libraries/libidn-${idnversion}.tar.gz | tar -xz \
+    && cd libidn-${idnversion} \
+    && ./configure --host=armv6-linux-gnueabi --enable-static --disable-shared --disable-doc --without-examples \
+    && make -j $(nproc) install \
+    && cd .. \
+    && rm -r libidn-${idnversion}
+
 RUN curl -sSL https://ftl.pi-hole.net/libraries/termcap-${termcapversion}.tar.gz | tar -xz \
     && cd termcap-${termcapversion} \
     && ./configure --host=arm-linux-gnueabi --enable-static --disable-shared --disable-doc --without-examples \
@@ -57,6 +70,12 @@ RUN curl -sSL https://ftl.pi-hole.net/libraries/readline-${readlineversion}.tar.
     && cd .. \
     && rm -r readline-${readlineversion}
 
-# Uncomment the following line to test-compile FTL master during docker container development
-# RUN git clone https://github.com/pi-hole/FTL.git && cd FTL && git checkout development \
-#     && bash build.sh -DLUA_READLINE=true && readelf -A ./pihole-FTL
+# Test compile FTL's development branch, the result is removed from the final container
+# We accept errors in the test step to be able to update the arch_tests if a change is intended
+RUN git clone https://github.com/pi-hole/FTL.git \
+    && cd FTL \
+    && git checkout "${BRANCH}" \
+    && bash .circleci/build-CI.sh "${STATIC}" "${BRANCH}" "${CIRCLE_TAG}" "${CIRCLE_JOB}" \
+    && bash test/arch_test.sh \
+    && cd .. \
+    && rm -r FTL
diff --git a/ftl-build/armv5te/Dockerfile b/ftl-build/armv5te/Dockerfile
@@ -1,8 +1,14 @@
 FROM debian:buster
 
+# For FTL test compilation
+ARG CIRCLE_JOB="armv5te"
+ARG CIRCLE_TAG="test-build"
+ARG BRANCH="special/CI_development"
+
 # ghr 0.13.0 2019-09-16
 ARG ghrversion=0.13.0
 
+ARG idnversion=1.36
 ARG readlineversion=8.0
 ARG termcapversion=1.3.1
 
@@ -18,7 +24,6 @@ RUN dpkg --add-architecture armel \
         libc6-dev-armel-cross \
         libcap-dev:armel \
         libcap2-bin \
-        libidn11-dev:armel \
         make \
         netcat-traditional \
         nettle-dev:armel \
@@ -38,6 +43,13 @@ RUN curl -sSL https://github.com/tcnksm/ghr/releases/download/v${ghrversion}/ghr
 ENV CC "arm-linux-gnueabi-gcc -isystem /usr/local/include"
 RUN ln -s /usr/arm-linux-gnueabi/lib/libm.so /usr/local/lib/
 
+RUN curl -sSL https://ftl.pi-hole.net/libraries/libidn-${idnversion}.tar.gz | tar -xz \
+    && cd libidn-${idnversion} \
+    && ./configure --host=armv6-linux-gnueabi --enable-static --disable-shared --disable-doc --without-examples \
+    && make -j $(nproc) install \
+    && cd .. \
+    && rm -r libidn-${idnversion}
+
 RUN curl -sSL https://ftl.pi-hole.net/libraries/termcap-${termcapversion}.tar.gz | tar -xz \
     && cd termcap-${termcapversion} \
     && ./configure --host=arm-linux-gnueabi --enable-static --disable-shared --disable-doc --without-examples \
@@ -56,6 +68,12 @@ RUN curl -sSL https://ftl.pi-hole.net/libraries/readline-${readlineversion}.tar.
     && cd .. \
     && rm -r readline-${readlineversion}
 
-# Uncomment the following line to test-compile FTL master during docker container development
-# RUN git clone https://github.com/pi-hole/FTL.git && cd FTL && git checkout development \
-#     && bash build.sh -DLUA_READLINE=true && readelf -A ./pihole-FTL
+# Test compile FTL's development branch, the result is removed from the final container
+# We accept errors in the test step to be able to update the arch_tests if a change is intended
+RUN git clone https://github.com/pi-hole/FTL.git \
+    && cd FTL \
+    && git checkout "${BRANCH}" \
+    && bash .circleci/build-CI.sh "${STATIC}" "${BRANCH}" "${CIRCLE_TAG}" "${CIRCLE_JOB}" \
+    && bash test/arch_test.sh \
+    && cd .. \
+    && rm -r FTL
diff --git a/ftl-build/armv6hf/Dockerfile b/ftl-build/armv6hf/Dockerfile
@@ -1,8 +1,15 @@
-FROM debian:buster
+# We cannot use stretch here due to libc-incompatibilities (undefined reference to `fcntl64')
+FROM debian:stretch
+
+# For FTL test compilation
+ARG CIRCLE_JOB="armv6hf"
+ARG CIRCLE_TAG="test-build"
+ARG BRANCH="special/CI_development"
 
 # ghr 0.13.0 2019-09-16
 ARG ghrversion=0.13.0
 
+ARG idnversion=1.36
 ARG readlineversion=8.0
 ARG termcapversion=1.3.1
 
@@ -54,11 +61,12 @@ RUN wget ftl.pi-hole.net/libraries/libgmp.a -O /usr/local/lib/libgmp.a && \
 ENV CC "arm-linux-gnueabihf-gcc -isystem /usr/include -isystem /usr/include/arm-linux-gnueabi -isystem /usr/local/include -L/usr/local/lib"
 RUN ln -s /usr/arm-linux-gnueabihf/sysroot/usr/lib/libm.so /usr/local/lib/
 
-# Download and cross-compile libidn, we prevent the examples from being built as they will not
-# run on the x86_64 host and lead to errors
-RUN curl -sSL https://ftp.gnu.org/gnu/libidn/libidn-1.35.tar.gz | tar -xz && \
-    cd libidn-1.35 && ./configure --host=armv6-linux-gnueabi --disable-shared --disable-doc --without-examples && \
-    make -j $(nproc) install
+RUN curl -sSL https://ftl.pi-hole.net/libraries/libidn-${idnversion}.tar.gz | tar -xz \
+    && cd libidn-${idnversion} \
+    && ./configure --host=armv6-linux-gnueabi --enable-static --disable-shared --disable-doc --without-examples \
+    && make -j $(nproc) install \
+    && cd .. \
+    && rm -r libidn-${idnversion}
 
 RUN curl -sSL https://ftl.pi-hole.net/libraries/termcap-${termcapversion}.tar.gz | tar -xz \
     && cd termcap-${termcapversion} \
@@ -78,6 +86,12 @@ RUN curl -sSL https://ftl.pi-hole.net/libraries/readline-${readlineversion}.tar.
     && cd .. \
     && rm -r readline-${readlineversion}
 
-# Uncomment the following line to test-compile FTL master during docker container development
-# RUN git clone https://github.com/pi-hole/FTL.git && cd FTL && git checkout development \
-#     && bash build.sh -DLUA_READLINE=true && readelf -A ./pihole-FTL
+# Test compile FTL's development branch, the result is removed from the final container
+# We accept errors in the test step to be able to update the arch_tests if a change is intended
+RUN git clone https://github.com/pi-hole/FTL.git \
+    && cd FTL \
+    && git checkout "${BRANCH}" \
+    && bash .circleci/build-CI.sh "${STATIC}" "${BRANCH}" "${CIRCLE_TAG}" "${CIRCLE_JOB}" \
+    && bash test/arch_test.sh \
+    && cd .. \
+    && rm -r FTL
diff --git a/ftl-build/armv7hf/Dockerfile b/ftl-build/armv7hf/Dockerfile
@@ -1,8 +1,14 @@
 FROM debian:buster
 
+# For FTL test compilation
+ARG CIRCLE_JOB="armv7hf"
+ARG CIRCLE_TAG="test-build"
+ARG BRANCH="special/CI_development"
+
 # ghr 0.13.0 2019-09-16
 ARG ghrversion=0.13.0
 
+ARG idnversion=1.36
 ARG readlineversion=8.0
 ARG termcapversion=1.3.1
 
@@ -18,7 +24,6 @@ RUN dpkg --add-architecture armhf \
         libc6-dev-armhf-cross \
         libcap-dev:armhf \
         libcap2-bin \
-        libidn11-dev:armhf \
         make \
         netcat-traditional \
         nettle-dev:armhf \
@@ -38,9 +43,16 @@ RUN curl -sSL https://github.com/tcnksm/ghr/releases/download/v${ghrversion}/ghr
 ENV CC "arm-linux-gnueabihf-gcc -isystem /usr/local/include"
 RUN ln -s /usr/arm-linux-gnueabihf/lib/libm.so /usr/local/lib/
 
+RUN curl -sSL https://ftl.pi-hole.net/libraries/libidn-${idnversion}.tar.gz | tar -xz \
+    && cd libidn-${idnversion} \
+    && ./configure --host=armv7-linux-gnueabi --enable-static --disable-shared --disable-doc --without-examples \
+    && make -j $(nproc) install \
+    && cd .. \
+    && rm -r libidn-${idnversion}
+
 RUN curl -sSL https://ftl.pi-hole.net/libraries/termcap-${termcapversion}.tar.gz | tar -xz \
     && cd termcap-${termcapversion} \
-    && ./configure --host=arm-linux-gnueabihf --enable-static --disable-shared --disable-doc --without-examples \
+    && ./configure --host=armv7-linux-gnueabihf --enable-static --disable-shared --disable-doc --without-examples \
     && make -j $(nproc) \
     && make install \
     && ls /usr/local/lib/ \
@@ -49,13 +61,19 @@ RUN curl -sSL https://ftl.pi-hole.net/libraries/termcap-${termcapversion}.tar.gz
 
 RUN curl -sSL https://ftl.pi-hole.net/libraries/readline-${readlineversion}.tar.gz | tar -xz \
     && cd readline-${readlineversion} \
-    && ./configure --host=arm-linux-gnueabihf --enable-static --disable-shared --disable-doc --without-examples \
+    && ./configure --host=armv7-linux-gnueabihf --enable-static --disable-shared --disable-doc --without-examples \
     && make -j $(nproc) \
     && make install-static \
     && ls /usr/local/lib/ \
     && cd .. \
     && rm -r readline-${readlineversion}
 
-# Uncomment the following line to test-compile FTL master during docker container development
-# RUN git clone https://github.com/pi-hole/FTL.git && cd FTL && git checkout development \
-#     && bash build.sh -DLUA_READLINE=true && readelf -A ./pihole-FTL
+# Test compile FTL's development branch, the result is removed from the final container
+# We accept errors in the test step to be able to update the arch_tests if a change is intended
+RUN git clone https://github.com/pi-hole/FTL.git \
+    && cd FTL \
+    && git checkout "${BRANCH}" \
+    && bash .circleci/build-CI.sh "${STATIC}" "${BRANCH}" "${CIRCLE_TAG}" "${CIRCLE_JOB}" \
+    && bash test/arch_test.sh \
+    && cd .. \
+    && rm -r FTL
diff --git a/ftl-build/armv8a/Dockerfile b/ftl-build/armv8a/Dockerfile
@@ -0,0 +1,79 @@
+FROM debian:buster
+
+# For FTL test compilation
+ARG CIRCLE_JOB="armv8a"
+ARG CIRCLE_TAG="test-build"
+ARG BRANCH="special/CI_development"
+
+# ghr 0.13.0 2019-09-16
+ARG ghrversion=0.13.0
+
+ARG idnversion=1.36
+ARG readlineversion=8.0
+ARG termcapversion=1.3.1
+
+RUN dpkg --add-architecture armhf \
+    && apt-get update \
+    && apt-get install --no-install-recommends -y \
+        ca-certificates \
+        curl \
+        dnsutils \
+        file \
+        gcc-arm-linux-gnueabihf \
+        git \
+        libc6-dev-armhf-cross \
+        libcap-dev:armhf \
+        libcap2-bin \
+        make \
+        netcat-traditional \
+        nettle-dev:armhf \
+        ssh \
+        sqlite3 \
+        wget \
+        binutils \
+        cmake \
+        libc6:armhf \
+    && rm -rf /var/lib/apt/lists/*
+
+# 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 | \
+    tar --strip-components=1 -C /usr/bin/ -xz \
+    ghr_v${ghrversion}_linux_amd64/ghr
+
+ENV CC "arm-linux-gnueabihf-gcc -march=armv8-a -isystem /usr/local/include"
+RUN ln -s /usr/arm-linux-gnueabihf/lib/libm.so /usr/local/lib/
+
+RUN curl -sSL https://ftl.pi-hole.net/libraries/libidn-${idnversion}.tar.gz | tar -xz \
+    && cd libidn-${idnversion} \
+    && ./configure --host=armv8-linux-gnueabi --enable-static --disable-shared --disable-doc --without-examples \
+    && make -j $(nproc) install \
+    && cd .. \
+    && rm -r libidn-${idnversion}
+
+RUN curl -sSL https://ftl.pi-hole.net/libraries/termcap-${termcapversion}.tar.gz | tar -xz \
+    && cd termcap-${termcapversion} \
+    && ./configure --host=armv8-linux-gnueabihf --enable-static --disable-shared --disable-doc --without-examples \
+    && make -j $(nproc) \
+    && make install \
+    && ls /usr/local/lib/ \
+    && cd .. \
+    && rm -r termcap-${termcapversion}
+
+RUN curl -sSL https://ftl.pi-hole.net/libraries/readline-${readlineversion}.tar.gz | tar -xz \
+    && cd readline-${readlineversion} \
+    && ./configure --host=armv8-linux-gnueabihf --enable-static --disable-shared --disable-doc --without-examples \
+    && make -j $(nproc) \
+    && make install-static \
+    && ls /usr/local/lib/ \
+    && cd .. \
+    && rm -r readline-${readlineversion}
+
+# Test compile FTL's development branch, the result is removed from the final container
+# We accept errors in the test step to be able to update the arch_tests if a change is intended
+RUN git clone https://github.com/pi-hole/FTL.git \
+    && cd FTL \
+    && git checkout "${BRANCH}" \
+    && bash .circleci/build-CI.sh "${STATIC}" "${BRANCH}" "${CIRCLE_TAG}" "${CIRCLE_JOB}" \
+    && bash test/arch_test.sh \
+    && cd .. \
+    && rm -r FTL
diff --git a/ftl-build/x86_32/Dockerfile b/ftl-build/x86_32/Dockerfile
@@ -1,8 +1,14 @@
-FROM debian:stretch
+FROM debian:buster
+
+# For FTL test compilation
+ARG CIRCLE_JOB="x86_32"
+ARG CIRCLE_TAG="test-build"
+ARG BRANCH="special/CI_development"
 
 # ghr 0.13.0 2019-09-16
 ARG ghrversion=0.13.0
 
+ARG idnversion=1.36
 ARG readlineversion=8.0
 ARG termcapversion=1.3.1
 
@@ -18,7 +24,6 @@ RUN dpkg --add-architecture i386 \
         git \
         libcap2-bin \
         libcap-dev:i386 \
-        libidn11-dev:i386 \
         make \
         netcat-traditional \
         nettle-dev:i386 \
@@ -38,6 +43,13 @@ RUN curl -sSL https://github.com/tcnksm/ghr/releases/download/v${ghrversion}/ghr
 ENV CC "gcc -m32"
 RUN ln -s /usr/lib32/libm.so /usr/local/lib/
 
+RUN curl -sSL https://ftl.pi-hole.net/libraries/libidn-${idnversion}.tar.gz | tar -xz \
+    && cd libidn-${idnversion} \
+    && ./configure --host=armv7-linux-gnueabi --enable-static --disable-shared --disable-doc --without-examples \
+    && make -j $(nproc) install \
+    && cd .. \
+    && rm -r libidn-${idnversion}
+
 RUN curl -sSL https://ftl.pi-hole.net/libraries/termcap-${termcapversion}.tar.gz | tar -xz \
     && cd termcap-${termcapversion} \
     && ./configure --enable-static --disable-shared --disable-doc --without-examples \
@@ -56,6 +68,12 @@ RUN curl -sSL https://ftl.pi-hole.net/libraries/readline-${readlineversion}.tar.
     && cd .. \
     && rm -r readline-${readlineversion}
 
-# Uncomment the following line to test-compile FTL master during docker container development
-#RUN git clone https://github.com/pi-hole/FTL.git && cd FTL && git checkout development \
-#    && bash build.sh -DLUA_READLINE=true && readelf -A ./pihole-FTL
+# Test compile FTL's development branch, the result is removed from the final container
+# We accept errors in the test step to be able to update the arch_tests if a change is intended
+RUN git clone https://github.com/pi-hole/FTL.git \
+    && cd FTL \
+    && git checkout "${BRANCH}" \
+    && bash .circleci/build-CI.sh "${STATIC}" "${BRANCH}" "${CIRCLE_TAG}" "${CIRCLE_JOB}" \
+    && bash test/arch_test.sh \
+    && cd .. \
+    && rm -r FTL