Merge pull request #456 from anthonyraymond/master
Improved arm32v7 dockerfile
This commit is contained in:
hamza zia
GitHub
commit
a2d53d60a2
|
|
@ -6,3 +6,5 @@ docker-compose.yml
|
|||
LICENCE
|
||||
README.md
|
||||
webui-aria2.spec
|
||||
app.json
|
||||
static.json
|
||||
|
|
|
|||
|
|
@ -1,55 +0,0 @@
|
|||
FROM resin/rpi-raspbian
|
||||
|
||||
# less priviledge user, the id should map the user the downloaded files belongs to
|
||||
RUN groupadd -r aria && useradd -m -r -g aria aria -u 1000
|
||||
|
||||
# webui + aria2
|
||||
RUN apt-get update \
|
||||
&& apt-get install -y busybox curl 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 \
|
||||
&& ARIA2_VERSION="1.32.0" \
|
||||
&& 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 \
|
||||
&& tar -xzf aria2.tar.gz \
|
||||
&& cd aria2-$ARIA2_VERSION \
|
||||
&& autoreconf -i && ./configure && make \
|
||||
&& mv src/aria2c /usr/bin/ \
|
||||
&& cd ../.. \
|
||||
&& rm -rf aria_build \
|
||||
&& apt-get remove --purge --auto-remove 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 \
|
||||
&& apt-get install -y libxml2 libsqlite3-0 libc-ares2 zlib1g \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
ADD . /webui-aria2
|
||||
|
||||
# gosu install latest
|
||||
RUN GITHUB_REPO="https://github.com/tianon/gosu" \
|
||||
&& LATEST=`curl -s $GITHUB_REPO"/releases/latest" | grep -Eo "[0-9].[0-9]*"` \
|
||||
&& curl -L $GITHUB_REPO"/releases/download/"$LATEST"/gosu-armhf" > /usr/local/bin/gosu \
|
||||
&& chmod +x /usr/local/bin/gosu
|
||||
|
||||
# goreman install
|
||||
RUN curl -L "https://storage.googleapis.com/golang/go1.9.1.linux-armv6l.tar.gz" > go.tar.gz \
|
||||
&& tar -xzf go.tar.gz -C /usr/local \
|
||||
&& 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 \
|
||||
&& apt-get remove --purge --auto-remove git \
|
||||
&& rm go.tar.gz && rm -rf $GOROOT && rm -rf $GOPATH/src && rm -rf $GOPATH/pkg \
|
||||
&& unset GOROOT && unset GOPATH
|
||||
|
||||
# goreman setup
|
||||
RUN echo "web: gosu aria /bin/busybox httpd -f -p 8080 -h /webui-aria2\nbackend: gosu aria bash -c 'shopt -s dotglob nullglob && /usr/bin/aria2c --dir=/data/downloads/ --conf-path=/home/aria/.aria2/aria2.conf /data/downloads/*.torrent'" > Procfile
|
||||
|
||||
# aria2 downloads directory
|
||||
VOLUME /data/downloads
|
||||
# aria2 conf directory
|
||||
VOLUME /home/aria/.aria2
|
||||
|
||||
# aria2 RPC port, map as-is or reconfigure webui
|
||||
EXPOSE 6800/tcp
|
||||
|
||||
# webui static content web server, map wherever is convenient
|
||||
EXPOSE 8080/tcp
|
||||
|
||||
CMD ["start"]
|
||||
ENTRYPOINT ["/usr/local/bin/goreman"]
|
||||
81
Dockerfile.arm32v7
Normal file
81
Dockerfile.arm32v7
Normal file
|
|
@ -0,0 +1,81 @@
|
|||
# As of 2018-06-29 https://github.com/aria2/aria2/blob/master/Dockerfile.raspberrypi, aria2 is build upon ubuntu trusty (which is debian 8). So pick a debian 8 as well
|
||||
FROM arm32v7/debian:8.11 AS aria2-builder
|
||||
|
||||
# aria2 build
|
||||
RUN mkdir -p /builds && mkdir -p /builds/aria2c \
|
||||
&& apt-get update \
|
||||
&& export DEBIAN_FRONTEND=noninteractive \
|
||||
&& apt-get install -y curl 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 openssl \
|
||||
&& ARIA2_VERSION="1.34.0" \
|
||||
&& 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 \
|
||||
&& tar -xzf aria2.tar.gz \
|
||||
&& cd aria2-$ARIA2_VERSION \
|
||||
&& autoreconf -i \
|
||||
&& ./configure --with-ca-bundle='/etc/ssl/certs/ca-certificates.crt' \
|
||||
&& make \
|
||||
&& mv src/aria2c /builds/aria2c \
|
||||
&& cd ../.. \
|
||||
&& rm -rf aria_build \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
|
||||
|
||||
FROM arm32v7/golang:1.10.0-stretch AS go-builder
|
||||
|
||||
# goreman build
|
||||
RUN mkdir -p /builds && mkdir -p /builds/goreman \
|
||||
&& export GOPATH=`pwd` \
|
||||
&& go get github.com/mattn/goreman \
|
||||
&& go build -o /builds/goreman/goreman github.com/mattn/goreman
|
||||
|
||||
RUN mkdir -p /builds && mkdir -p /builds/gosu \
|
||||
&& apt-get update && apt-get install -y curl \
|
||||
&& GITHUB_REPO="https://github.com/tianon/gosu" \
|
||||
&& LATEST=`curl -s $GITHUB_REPO"/releases/latest" | grep -Eo "[0-9].[0-9]*"` \
|
||||
&& curl -L $GITHUB_REPO"/releases/download/"$LATEST"/gosu-armhf" > /builds/gosu/gosu \
|
||||
&& chmod +x /builds/gosu/gosu \
|
||||
&& unset GITHUB_REPO && unset LATEST \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
|
||||
|
||||
FROM arm32v7/httpd:2.4.33
|
||||
# BE CAREFULL the arm32v7/httpd image MUST match the version of debian used to build aria2. otherwise shared library versions might not be the same.
|
||||
# A better approach will be to build static version of aria2.
|
||||
|
||||
# download aria2 dependendies
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
busybox \
|
||||
ca-certificates \
|
||||
libc-ares2 \
|
||||
libssh2-1 \
|
||||
libxml2 \
|
||||
openssl \
|
||||
libsqlite3-0 \
|
||||
zlib1g \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Grab aria2c, goreman and gosu binaries
|
||||
COPY --from=aria2-builder /builds/aria2c/aria2c /usr/bin/
|
||||
COPY --from=go-builder /builds/goreman/goreman /usr/local/bin/
|
||||
COPY --from=go-builder /builds/gosu/gosu /usr/local/bin/
|
||||
|
||||
ADD . /webui-aria2
|
||||
|
||||
RUN groupadd -r aria \
|
||||
&& useradd -m -r -g aria aria -u 1000 \
|
||||
&& echo "web: gosu aria /bin/busybox httpd -f -p 8080 -h /webui-aria2\nbackend: gosu aria bash -c 'shopt -s dotglob nullglob && /usr/bin/aria2c --dir=/data/downloads/ --conf-path=/home/aria/.aria2/aria2.conf /data/downloads/*.torrent'" > Procfile
|
||||
|
||||
# aria2 downloads directory
|
||||
VOLUME /data/downloads
|
||||
|
||||
# aria2 conf directory
|
||||
VOLUME /home/aria/.aria2
|
||||
|
||||
# webui static content web server and aria2 RPC port
|
||||
EXPOSE 8080 6800
|
||||
|
||||
CMD ["start"]
|
||||
ENTRYPOINT ["/usr/local/bin/goreman"]
|
||||
13
README.md
13
README.md
|
|
@ -39,7 +39,7 @@ Well, you need aria2. And a web browser (if that even counts!)
|
|||
Docker support
|
||||
==============
|
||||
There is two Dockerfile in this project, one is a common Dockerfile, which can be use for **testing purpose**.<br>
|
||||
The second is a **production ready** Dockerfile for raspberry and other ARM plateforms.
|
||||
The second is a **production ready** Dockerfile for arm32v7 plateforms (which includes raspberry).
|
||||
|
||||
### For testing purpose
|
||||
|
||||
|
|
@ -63,10 +63,17 @@ sudo docker run -v /Downloads:/data -p 6800:6800 -p 9100:8080 --name="webui-aria
|
|||
|
||||
This image contains both aria2 and webui-aria2.
|
||||
|
||||
Build it (may take several hours due to the aria2 compilation process. Don't panic and grab a coffee)
|
||||
Build it (may take several hours due to the aria2 compilation process. Don't panic and grab a coffee).
|
||||
```
|
||||
docker build -f Dockerfile.arm -t yourname/webui-aria2 .
|
||||
docker build -f Dockerfile.arm32v7 -t yourname/webui-aria2 .
|
||||
```
|
||||
|
||||
This command will ends up building three images:
|
||||
- The first one is just about compiling aria2 and goreman binaries. It MUST be deleted each time the `ARIA2_VERSION` is changed in the Dockerfile, otherwise you won't benefit from the update.
|
||||
- The second is about building and downloading some go dependencies (goreman and gosu).
|
||||
- The second one is the acutal aria2 container, the one you must use.
|
||||
|
||||
<br />
|
||||
Prepare the host volume:
|
||||
This image required few file to be mounted in the container.
|
||||
```
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user