From c41b608c454b92abff591122b653ee2750bca90e Mon Sep 17 00:00:00 2001 From: kev Date: Sun, 17 Sep 2017 12:11:16 +0800 Subject: [PATCH] fix hydra --- hydra/Dockerfile | 7 +++++-- hydra/arm/Dockerfile | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/hydra/Dockerfile b/hydra/Dockerfile index 1c1ac8c..7272031 100644 --- a/hydra/Dockerfile +++ b/hydra/Dockerfile @@ -5,13 +5,15 @@ FROM alpine MAINTAINER EasyPi Software Foundation +ENV HYDRA_VERSION=8.6 +ENV HYDRA_URL=https://github.com/vanhauser-thc/thc-hydra/archive/$HYDRA_VERSION.tar.gz + RUN set -xe \ && apk add --no-cache apr-dev \ apr-util-dev \ bash \ build-base \ curl \ - git \ jq \ libidn \ libidn-dev \ @@ -28,10 +30,11 @@ RUN set -xe \ postgresql-dev \ subversion-dev \ subversion-libs \ + tar \ && echo 'will cite' | parallel --bibtex \ && mkdir src \ && cd src \ - && git clone --depth 1 https://github.com/vanhauser-thc/thc-hydra.git . \ + && curl -sSL $HYDRA_URL | tar xz --strip 1 \ && ./configure --prefix=/usr \ && make install \ && cd .. \ diff --git a/hydra/arm/Dockerfile b/hydra/arm/Dockerfile index e8b460b..c43eccd 100644 --- a/hydra/arm/Dockerfile +++ b/hydra/arm/Dockerfile @@ -5,13 +5,15 @@ FROM easypi/alpine-arm MAINTAINER EasyPi Software Foundation +ENV HYDRA_VERSION=8.6 +ENV HYDRA_URL=https://github.com/vanhauser-thc/thc-hydra/archive/$HYDRA_VERSION.tar.gz + RUN set -xe \ && apk add --no-cache apr-dev \ apr-util-dev \ bash \ build-base \ curl \ - git \ jq \ libidn \ libidn-dev \ @@ -28,10 +30,11 @@ RUN set -xe \ postgresql-dev \ subversion-dev \ subversion-libs \ + tar \ && echo 'will cite' | parallel --bibtex \ && mkdir src \ && cd src \ - && git clone --depth 1 https://github.com/vanhauser-thc/thc-hydra.git . \ + && curl -sSL $HYDRA_URL | tar xz --strip 1 \ && ./configure --prefix=/usr \ && make install \ && cd .. \