From cb6eb3de9b70faaf4ea9ac71c9b02bcb557fbb10 Mon Sep 17 00:00:00 2001 From: Mcat12 Date: Sun, 27 Jan 2019 15:47:42 -0800 Subject: [PATCH] Replace arm container with arm-rpi, delete arm-rpi Signed-off-by: Mcat12 --- .circleci/config.yml | 9 --------- docker/arm-rpi/Dockerfile | 22 ---------------------- docker/arm/Dockerfile | 22 ++++++++++++++++++---- 3 files changed, 18 insertions(+), 35 deletions(-) delete mode 100644 docker/arm-rpi/Dockerfile diff --git a/.circleci/config.yml b/.circleci/config.yml index 34d6c5d8..38b49d6f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -35,11 +35,6 @@ jobs: environment: BIN_NAME: "pihole-FTL-arm-linux-gnueabi" - arm-rpi: - <<: *job_template - environment: - BIN_NAME: "pihole-FTL-armv6-linux-gnueabihf" - armhf: <<: *job_template environment: @@ -74,10 +69,6 @@ workflows: filters: tags: only: /^v.*/ - - arm-rpi: - filters: - tags: - only: /^v.*/ - armhf: filters: tags: diff --git a/docker/arm-rpi/Dockerfile b/docker/arm-rpi/Dockerfile deleted file mode 100644 index 0d920b4d..00000000 --- a/docker/arm-rpi/Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -FROM debian:stretch - -RUN dpkg --add-architecture armhf && \ - apt-get update && \ - apt-get install -y --no-install-recommends nettle-dev:armhf libcap-dev:armhf \ - make file wget netcat-traditional sqlite3 git ca-certificates ssh - -# Use Raspbian's GCC -# This command was taken from https://github.com/dockcross/dockcross/blob/master/linux-armv6/Dockerfile -# Slightly modified from the original -RUN mkdir rpi_tools && cd rpi_tools && git init && git remote add origin https://github.com/raspberrypi/tools && \ - git config core.sparseCheckout true && \ - echo "arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf" >> .git/info/sparse-checkout && \ - git pull --depth=1 origin master && \ - cp -a arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf/* /usr/ && rm -rf ../rpi_tools - -RUN wget ftl.pi-hole.net/libraries/libgmp.a -O /usr/local/lib/libgmp.a && \ - wget ftl.pi-hole.net/libraries/libnettle.a -O /usr/local/lib/libnettle.a && \ - wget ftl.pi-hole.net/libraries/libhogweed.a -O /usr/local/lib/libhogweed.a - -# Allow libnettle to be used, because this GCC doesn't have all the right header and library directories -ENV CC "arm-linux-gnueabihf-gcc -I/usr/include -I/usr/include/arm-linux-gnueabihf" diff --git a/docker/arm/Dockerfile b/docker/arm/Dockerfile index 5d4230c2..0d920b4d 100644 --- a/docker/arm/Dockerfile +++ b/docker/arm/Dockerfile @@ -1,8 +1,22 @@ FROM debian:stretch -RUN dpkg --add-architecture armel && \ +RUN dpkg --add-architecture armhf && \ apt-get update && \ - apt-get install -y --no-install-recommends nettle-dev:armel gcc-arm-linux-gnueabi libc6-dev-armel-cross \ - make file wget netcat-traditional sqlite3 git ca-certificates ssh libcap-dev:armel + apt-get install -y --no-install-recommends nettle-dev:armhf libcap-dev:armhf \ + make file wget netcat-traditional sqlite3 git ca-certificates ssh -ENV CC arm-linux-gnueabi-gcc +# Use Raspbian's GCC +# This command was taken from https://github.com/dockcross/dockcross/blob/master/linux-armv6/Dockerfile +# Slightly modified from the original +RUN mkdir rpi_tools && cd rpi_tools && git init && git remote add origin https://github.com/raspberrypi/tools && \ + git config core.sparseCheckout true && \ + echo "arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf" >> .git/info/sparse-checkout && \ + git pull --depth=1 origin master && \ + cp -a arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf/* /usr/ && rm -rf ../rpi_tools + +RUN wget ftl.pi-hole.net/libraries/libgmp.a -O /usr/local/lib/libgmp.a && \ + wget ftl.pi-hole.net/libraries/libnettle.a -O /usr/local/lib/libnettle.a && \ + wget ftl.pi-hole.net/libraries/libhogweed.a -O /usr/local/lib/libhogweed.a + +# Allow libnettle to be used, because this GCC doesn't have all the right header and library directories +ENV CC "arm-linux-gnueabihf-gcc -I/usr/include -I/usr/include/arm-linux-gnueabihf"