Skip to content

Commit

Permalink
Add arch to docker image version
Browse files Browse the repository at this point in the history
  • Loading branch information
jaymoulin committed Jan 6, 2019
1 parent f95ad5a commit bd1d38b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
6 changes: 4 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ COPY qemu-arm-static /usr/bin/
FROM builder

ARG ARCH=armhf
ARG VERSION="0.6.0"
ARG VERSION="0.6.1"
LABEL maintainer="Jay MOULIN <[email protected]> <https://twitter.com/MoulinJay>"
LABEL version="${VERSION}"
LABEL version="${VERSION}-${ARCH}"

COPY ./${ARCH}/*.jar /opt/JDownloader/libs/
# archive extraction uses sevenzipjbinding library
Expand All @@ -24,6 +24,8 @@ RUN mkdir -p /opt/JDownloader/ && \
apk del wget --purge .build-deps && \
rm /usr/bin/qemu-*-static
ENV LD_LIBRARY_PATH=/lib;/lib32;/usr/lib
ENV LANG=C.UTF-8
ENV LC_ALL=C.UTF-8

COPY daemon.sh /opt/JDownloader/
COPY default-config.json.dist /opt/JDownloader/org.jdownloader.api.myjdownloader.MyJDownloaderSettings.json.dist
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION ?= 0.6.0
VERSION ?= 0.6.1
CACHE ?= --no-cache=1
FULLVERSION ?= ${VERSION}
archs ?= amd64 arm32v6 arm64v8 i386
Expand Down

0 comments on commit bd1d38b

Please sign in to comment.