Merge pull request #315 from anthonyraymond/master

Update ARM dockerfile
This commit is contained in:
hamza zia 2017-03-18 18:28:36 +08:00 committed by GitHub
commit 3807034f44
2 changed files with 3 additions and 3 deletions

View File

@ -8,7 +8,7 @@ RUN apt-get update \
&& apt-get install -y busybox curl \ && apt-get install -y busybox curl \
git \ git \
make g++ libssl-dev nettle-dev libgmp-dev libssh2-1-dev libc-ares-dev libxml2-dev zlib1g-dev libsqlite3-dev pkg-config libxml2-dev libcppunit-dev autoconf automake autotools-dev autopoint libtool \ make g++ libssl-dev nettle-dev libgmp-dev libssh2-1-dev libc-ares-dev libxml2-dev zlib1g-dev libsqlite3-dev pkg-config libxml2-dev libcppunit-dev autoconf automake autotools-dev autopoint libtool \
&& ARIA2_VERSION="1.30.0" \ && ARIA2_VERSION="1.31.0" \
&& mkdir aria_build && cd aria_build \ && mkdir aria_build && cd aria_build \
&& curl -L https://github.com/aria2/aria2/releases/download/release-"$ARIA2_VERSION"/aria2-"$ARIA2_VERSION".tar.gz > aria2.tar.gz \ && curl -L https://github.com/aria2/aria2/releases/download/release-"$ARIA2_VERSION"/aria2-"$ARIA2_VERSION".tar.gz > aria2.tar.gz \
&& tar -xzf aria2.tar.gz \ && tar -xzf aria2.tar.gz \
@ -30,7 +30,7 @@ RUN GITHUB_REPO="https://github.com/tianon/gosu" \
&& chmod +x /usr/local/bin/gosu && chmod +x /usr/local/bin/gosu
# goland install (compile source code for ARM since no version are currently available) # goland install (compile source code for ARM since no version are currently available)
RUN curl -L "https://storage.googleapis.com/golang/go1.6.1.linux-armv6l.tar.gz" > go.tar.gz \ RUN curl -L "https://storage.googleapis.com/golang/go1.8.linux-armv6l.tar.gz" > go.tar.gz \
&& tar -xzf go.tar.gz -C /usr/local \ && tar -xzf go.tar.gz -C /usr/local \
&& export GOROOT="/usr/local/go" && export GOPATH=`pwd` \ && export GOROOT="/usr/local/go" && export GOPATH=`pwd` \
&& $GOROOT/bin/go get github.com/mattn/goreman && $GOROOT/bin/go build -o /usr/local/bin/goreman github.com/mattn/goreman \ && $GOROOT/bin/go get github.com/mattn/goreman && $GOROOT/bin/go build -o /usr/local/bin/goreman github.com/mattn/goreman \

View File

@ -62,7 +62,7 @@ This image contains both aria2 and webui-aria2.
Build it (may take several hours due to the aria2 compilation process. Don't panic and grap a coffee) Build it (may take several hours due to the aria2 compilation process. Don't panic and grap a coffee)
``` ```
docker build -f rpi-Dockerfile -t yourname/webui-aria2 . docker build -f Dockerfile.arm -t yourname/webui-aria2 .
``` ```
Prepare the host volume: Prepare the host volume:
This image required few file to be mounted in the container's `/data` folder. This image required few file to be mounted in the container's `/data` folder.