pi-hole/FTL
1
0
Fork 0
mirror of https://github.com/pi-hole/FTL.git synced 2024-10-26 16:52:18 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replace arm container with arm-rpi, delete arm-rpi

Browse Source 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
This commit is contained in:
Mcat12
2019-01-27 15:47:42 -08:00
parent 75f4f99fae
commit cb6eb3de9b
3 changed files with 18 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.circleci/config.yml
-9
View File
@@ -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:
docker/arm-rpi/Dockerfile
-22
View File
@@ -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"
docker/arm/Dockerfile
+18 -4
View File
@@ -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"