Skip to content

Commit 116d69f

Browse files
committed
fixes #7 - added multiarch + crossbuilding
1 parent 6967f16 commit 116d69f

File tree

7 files changed

+88
-15
lines changed

7 files changed

+88
-15
lines changed

.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
qemu-*-static
2+
*.yaml
3+
.Dockerfile

CONTRIBUTING.md

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
How to Contribute
2+
=================
3+
4+
This project welcomes your contribution. There are several ways to help out:
5+
6+
* Create an [issue](https://github.com/jaymoulin/jdownloader/issues/) on GitHub,
7+
if you have found a bug or have an idea for a feature
8+
* Write test cases for open bug issues
9+
* Write patches for open bug/feature issues
10+
11+
Issues
12+
------
13+
14+
* Submit an [issue](https://github.com/jaymoulin/jdownloader/issues/)
15+
* Make sure it does not already exist.
16+
* Clearly describe the issue including steps to reproduce, when it is a bug.
17+
* Make sure you note the version you use.
18+
19+
Additional Resources
20+
--------------------
21+
22+
* [Existing issues](https://github.com/jaymoulin/jdownloader/issues/)
23+
* [General GitHub documentation](https://help.github.com/)
24+
* [GitHub pull request documentation](https://help.github.com/send-pull-requests/)

Dockerfile

+10-7
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
1-
FROM larmog/armhf-alpine-java:jdk-8u73
1+
FROM openjdk:jre-alpine as builder
22

3-
MAINTAINER Jay MOULIN <[email protected]>
3+
COPY qemu-*-static /usr/bin/
4+
5+
FROM builder
6+
7+
LABEL maintainer="Jay MOULIN <[email protected]> <https://twitter.com/MoulinJay>"
48

59
# archive extraction uses sevenzipjbinding library
610
# which is compiled against libstdc++
7-
RUN mkdir /opt/JDownloader/
11+
RUN mkdir -p /opt/JDownloader/
812
RUN apk add --update libstdc++ ffmpeg && apk add wget --virtual .build-deps && \
9-
wget -O /opt/JDownloader/JDownloader.jar "http://installer.jdownloader.org/JDownloader.jar?$RANDOM" && chmod +x /opt/JDownloader/JDownloader.jar && \
10-
wget -O /sbin/tini "https://github.com/krallin/tini/releases/download/v0.16.1/tini-static-armhf" --no-check-certificate && chmod +x /sbin/tini && \
11-
apk del wget --purge .build-deps
13+
wget -O /opt/JDownloader/JDownloader.jar "http://installer.jdownloader.org/JDownloader.jar?$RANDOM" && chmod +x /opt/JDownloader/JDownloader.jar && \
14+
wget -O /sbin/tini "https://github.com/krallin/tini/releases/download/v0.16.1/tini-static-armhf" --no-check-certificate && chmod +x /sbin/tini && \
15+
apk del wget --purge .build-deps
1216
ENV LD_LIBRARY_PATH=/lib;/lib32;/usr/lib
1317

14-
1518
ADD daemon.sh /opt/JDownloader/
1619
ADD default-config.json.dist /opt/JDownloader/org.jdownloader.api.myjdownloader.MyJDownloaderSettings.json.dist
1720
ADD configure.sh /usr/bin/configure

Makefile

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
VERSION ?= 0.4.0
2+
FULLVERSION ?= ${VERSION}
3+
archs = amd64 arm32v6 arm64v8 i386
4+
5+
.PHONY: all build publish latest
6+
all: build publish latest
7+
build:
8+
cp /usr/bin/qemu-*-static .
9+
$(foreach arch,$(archs), \
10+
cat Dockerfile | sed "s/FROM openjdk:jre-alpine/FROM ${arch}\/openjdk:jre-alpine/g" > .Dockerfile; \
11+
docker build -t jaymoulin/jdownloader:${VERSION}-$(arch) -f .Dockerfile .;\
12+
)
13+
publish:
14+
docker push jaymoulin/jdownloader
15+
cat manifest.yml | sed "s/\$$VERSION/${VERSION}/g" > manifest.yaml
16+
cat manifest.yaml | sed "s/\$$FULLVERSION/${FULLVERSION}/g" > manifest2.yaml
17+
mv manifest2.yaml manifest.yaml
18+
manifest-tool push from-spec manifest.yaml
19+
latest: build
20+
FULLVERSION=latest VERSION=${VERSION} make publish

README.md

+7-8
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,22 @@
11
![logo](logo.png "logo")
22

3-
Raspberry PI - JDownloader - Docker Image
4-
=========================================
3+
JDownloader - Docker Image
4+
==========================
55

6-
[![latest release](https://img.shields.io/github/release/jaymoulin/docker-rpi-jdownloader.svg "latest release")](http://github.com/jaymoulin/docker-rpi-jdownloader/releases)
7-
[![Docker Pulls](https://img.shields.io/docker/pulls/jaymoulin/rpi-jdownloader.svg)](https://hub.docker.com/r/jaymoulin/rpi-jdownloader/)
8-
[![Docker stars](https://img.shields.io/docker/stars/jaymoulin/rpi-jdownloader.svg)](https://hub.docker.com/r/jaymoulin/rpi-jdownloader/)
6+
[![latest release](https://img.shields.io/github/release/jaymoulin/docker-jdownloader.svg "latest release")](http://github.com/jaymoulin/docker-jdownloader/releases)
7+
[![Docker Pulls](https://img.shields.io/docker/pulls/jaymoulin/jdownloader.svg)](https://hub.docker.com/r/jaymoulin/jdownloader/)
8+
[![Docker stars](https://img.shields.io/docker/stars/jaymoulin/jdownloader.svg)](https://hub.docker.com/r/jaymoulin/jdownloader/)
99
[![Bitcoin donation](https://github.com/jaymoulin/jaymoulin.github.io/raw/master/btc.png "Bitcoin donation")](https://m.freewallet.org/id/374ad82e/btc)
1010
[![Litecoin donation](https://github.com/jaymoulin/jaymoulin.github.io/raw/master/ltc.png "Litecoin donation")](https://m.freewallet.org/id/374ad82e/ltc)
1111
[![PayPal donation](https://github.com/jaymoulin/jaymoulin.github.io/raw/master/ppl.png "PayPal donation")](https://www.paypal.me/jaymoulin)
12-
[![Beerpay donation](https://beerpay.io/jaymoulin/docker-rpi-jdownloader/badge.svg "Beerpay donation")](https://beerpay.io/jaymoulin/docker-rpi-jdownloader)
1312

1413
This image allows you to have JDownloader daemon installed easily thanks to Docker.
1514

1615
Installation
1716
---
1817

1918
```
20-
docker run -d --restart=always -v ~/Downloads:/root/Downloads -v ~/jdownloader/cfg:/opt/JDownloader/cfg --name jdownloader jaymoulin/rpi-jdownloader
19+
docker run -d --restart=always -v ~/Downloads:/root/Downloads -v ~/jdownloader/cfg:/opt/JDownloader/cfg --name jdownloader jaymoulin/jdownloader
2120
```
2221

2322
You can replace `~/Downloads` with the folder you want your downloaded files to go.
@@ -38,7 +37,7 @@ Everything else can be configurable on your MyJDownloader account : https://my.j
3837
Appendixes
3938
---
4039

41-
### Install RaspberryPi Docker
40+
### Install Docker
4241

4342
If you don't have Docker installed yet, you can do it easily in one line using this command
4443

logo.png

-18.1 KB
Loading

manifest.yml

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
image: jaymoulin/jdownloader:$FULLVERSION
2+
manifests:
3+
-
4+
image: jaymoulin/jdownloader:$VERSION-arm32v6
5+
platform:
6+
architecture: arm
7+
variant: v6
8+
os: linux
9+
-
10+
image: jaymoulin/jdownloader:$VERSION-arm64v8
11+
platform:
12+
architecture: arm
13+
variant: v8
14+
os: linux
15+
-
16+
image: jaymoulin/jdownloader:$VERSION-amd64
17+
platform:
18+
architecture: arm64
19+
os: linux
20+
-
21+
image: jaymoulin/jdownloader:$VERSION-i386
22+
platform:
23+
architecture: 386
24+
os: linux

0 commit comments

Comments
 (0)