From 2bda304a6d4ff107d0d5ea1e68014c852f207c5d Mon Sep 17 00:00:00 2001 From: Mcat12 Date: Fri, 22 Feb 2019 19:54:53 -0800 Subject: [PATCH] Add ghr to the docker build container Signed-off-by: Mcat12 --- docker/aarch64/Dockerfile | 5 +++++ docker/arm/Dockerfile | 5 +++++ docker/armhf/Dockerfile | 5 +++++ docker/x86_32/Dockerfile | 5 +++++ docker/x86_64-musl/Dockerfile | 5 +++++ docker/x86_64/Dockerfile | 5 +++++ 6 files changed, 30 insertions(+) diff --git a/docker/aarch64/Dockerfile b/docker/aarch64/Dockerfile index b03a955c..59f1462b 100644 --- a/docker/aarch64/Dockerfile +++ b/docker/aarch64/Dockerfile @@ -5,4 +5,9 @@ RUN dpkg --add-architecture arm64 && \ apt-get install -y --no-install-recommends nettle-dev:arm64 gcc-aarch64-linux-gnu libc-dev-arm64-cross \ make file wget netcat-traditional sqlite3 git ca-certificates ssh libcap-dev:arm64 +# Install ghr for GitHub Releases: https://github.com/tcnksm/ghr +RUN wget https://github.com/tcnksm/ghr/releases/download/v0.12.0/ghr_v0.12.0_linux_amd64.tar.gz && \ + tar -xzf ghr_*_linux_amd64.tar.gz && \ + mv ghr_*_linux_amd64/ghr /usr/bin/ghr + ENV CC aarch64-linux-gnu-gcc diff --git a/docker/arm/Dockerfile b/docker/arm/Dockerfile index dbc71506..1043a66f 100644 --- a/docker/arm/Dockerfile +++ b/docker/arm/Dockerfile @@ -23,5 +23,10 @@ RUN dpkg --add-architecture armhf && \ apt-get install -y --no-install-recommends make file netcat-traditional ssh \ nettle-dev:armhf libcap-dev sqlite3 +# Install ghr for GitHub Releases: https://github.com/tcnksm/ghr +RUN wget https://github.com/tcnksm/ghr/releases/download/v0.12.0/ghr_v0.12.0_linux_amd64.tar.gz && \ + tar -xzf ghr_*_linux_amd64.tar.gz && \ + mv ghr_*_linux_amd64/ghr /usr/bin/ghr + # 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 -L/usr/local/lib" diff --git a/docker/armhf/Dockerfile b/docker/armhf/Dockerfile index 7eee3d71..4262ce33 100644 --- a/docker/armhf/Dockerfile +++ b/docker/armhf/Dockerfile @@ -5,4 +5,9 @@ RUN dpkg --add-architecture armhf && \ apt-get install -y --no-install-recommends nettle-dev:armhf gcc-arm-linux-gnueabihf libc6-dev-armhf-cross \ make file wget netcat-traditional sqlite3 git ca-certificates ssh libcap-dev:armhf +# Install ghr for GitHub Releases: https://github.com/tcnksm/ghr +RUN wget https://github.com/tcnksm/ghr/releases/download/v0.12.0/ghr_v0.12.0_linux_amd64.tar.gz && \ + tar -xzf ghr_*_linux_amd64.tar.gz && \ + mv ghr_*_linux_amd64/ghr /usr/bin/ghr + ENV CC arm-linux-gnueabihf-gcc diff --git a/docker/x86_32/Dockerfile b/docker/x86_32/Dockerfile index 87dae55e..4e326d6d 100644 --- a/docker/x86_32/Dockerfile +++ b/docker/x86_32/Dockerfile @@ -5,4 +5,9 @@ RUN dpkg --add-architecture i386 && \ apt-get install -y --no-install-recommends nettle-dev:i386 gcc gcc-multilib \ make file wget netcat-traditional sqlite3 git ca-certificates ssh libcap-dev:i386 +# Install ghr for GitHub Releases: https://github.com/tcnksm/ghr +RUN wget https://github.com/tcnksm/ghr/releases/download/v0.12.0/ghr_v0.12.0_linux_amd64.tar.gz && \ + tar -xzf ghr_*_linux_amd64.tar.gz && \ + mv ghr_*_linux_amd64/ghr /usr/bin/ghr + ENV CC "gcc -m32" diff --git a/docker/x86_64-musl/Dockerfile b/docker/x86_64-musl/Dockerfile index 4a7f46ab..78020f76 100644 --- a/docker/x86_64-musl/Dockerfile +++ b/docker/x86_64-musl/Dockerfile @@ -4,4 +4,9 @@ RUN apt-get update && \ apt-get install -y --no-install-recommends nettle-dev musl-tools \ make file wget netcat-traditional sqlite3 git ca-certificates ssh +# Install ghr for GitHub Releases: https://github.com/tcnksm/ghr +RUN wget https://github.com/tcnksm/ghr/releases/download/v0.12.0/ghr_v0.12.0_linux_amd64.tar.gz && \ + tar -xzf ghr_*_linux_amd64.tar.gz && \ + mv ghr_*_linux_amd64/ghr /usr/bin/ghr + ENV CC musl-gcc diff --git a/docker/x86_64/Dockerfile b/docker/x86_64/Dockerfile index 4b33a730..f1b6944e 100644 --- a/docker/x86_64/Dockerfile +++ b/docker/x86_64/Dockerfile @@ -4,4 +4,9 @@ RUN apt-get update && \ apt-get install -y --no-install-recommends nettle-dev gcc libc-dev \ make file wget netcat-traditional sqlite3 git ca-certificates ssh libcap-dev +# Install ghr for GitHub Releases: https://github.com/tcnksm/ghr +RUN wget https://github.com/tcnksm/ghr/releases/download/v0.12.0/ghr_v0.12.0_linux_amd64.tar.gz && \ + tar -xzf ghr_*_linux_amd64.tar.gz && \ + mv ghr_*_linux_amd64/ghr /usr/bin/ghr + ENV CC gcc