LAB-linuxserver/docker-davos
1
0
Fork 0
mirror of https://github.com/linuxserver/docker-davos.git synced 2026-02-20 04:35:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9 from thelamer/master

Browse Source 
updating build env and using gradle wrapper
This commit is contained in:
Josh Stark 2019-03-08 22:25:39 +00:00 committed by GitHub
commit ff859527cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Dockerfile
View File

@ -1,10 +1,12 @@
FROM gradle:4.10 as buildstage
FROM openjdk:8-alpine as buildstage
ARG DAVOS_RELEASE
USER root
RUN \
echo "**** Install build requirements ****" && \
apt-get update && apt-get install -y jq && \
apk add \
bash \
curl \
jq && \
echo "**** Download Davos ****" && \
if [ -z ${DAVOS_RELEASE+x} ]; then \
DAVOS_RELEASE=$(curl -sX GET https://api.github.com/repos/linuxserver/davos/releases/latest \
@ -20,7 +22,7 @@ RUN \
/tmp/davos.tar.gz -C \
/app/davos-test/ --strip-components=1 && \
cd /app/davos-test/ && \
gradle build cucumber && \
./gradlew build cucumber && \
echo "**** Build Davos For Release ****" && \
mkdir -p \
/app/davos/ && \
@ -28,7 +30,7 @@ RUN \
/tmp/davos.tar.gz -C \
/app/davos/ --strip-components=1 && \
cd /app/davos/ && \
gradle clean build && \
./gradlew -Penv=release clean build && \
echo "**** Copy Finished Jar ****" && \
cp build/libs/*.jar /davos.jar && \
chmod 755 /davos.jar

32
Dockerfile.aarch64
View File

@ -1,16 +1,16 @@
FROM gradle:4.10 as buildstage
FROM openjdk:8-alpine as buildstage
ARG DAVOS_RELEASE
USER root
# Add qemu to build on x86_64 systems
COPY qemu-aarch64-static /usr/bin
RUN \
echo "**** Install build requirements ****" && \
apt-get update && apt-get install -y jq && \
apk add \
bash \
curl \
jq && \
echo "**** Download Davos ****" && \
if [ -z ${DAVOS_RELEASE+x} ]; then \
DAVOS_RELEASE=$(curl -sX GET https://api.github.com/repos/linuxserver/davos/releases/latest \
| jq -r '. | .tag_name'); \
DAVOS_RELEASE=$(curl -sX GET https://api.github.com/repos/linuxserver/davos/releases/latest \
| jq -r '. | .tag_name'); \
fi && \
curl -o \
/tmp/davos.tar.gz -L \
@ -19,10 +19,10 @@ RUN \
mkdir -p \
/app/davos-test/ && \
tar xf \
/tmp/davos.tar.gz -C \
/app/davos-test/ --strip-components=1 && \
/tmp/davos.tar.gz -C \
/app/davos-test/ --strip-components=1 && \
cd /app/davos-test/ && \
gradle build cucumber && \
./gradlew build cucumber && \
echo "**** Build Davos For Release ****" && \
mkdir -p \
/app/davos/ && \
@ -30,7 +30,7 @@ RUN \
/tmp/davos.tar.gz -C \
/app/davos/ --strip-components=1 && \
cd /app/davos/ && \
gradle clean build && \
./gradlew -Penv=release clean build && \
echo "**** Copy Finished Jar ****" && \
cp build/libs/*.jar /davos.jar && \
chmod 755 /davos.jar
@ -38,21 +38,19 @@ RUN \
FROM lsiobase/alpine.arm64:3.9
# Add qemu to build on x86_64 systems
COPY qemu-aarch64-static /usr/bin
# set version label
ARG BUILD_DATE
ARG VERSION
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL maintainer="JAGFin1,Thelamer"
# Add qemu to build on x86_64 systems
COPY qemu-aarch64-static /usr/bin
# install packages
RUN \
apk add --no-cache \
curl && \
apk add --no-cache \
--repository http://nl.alpinelinux.org/alpine/edge/community \
curl \
openjdk8-jre
# copy files from build stage and local files

32
Dockerfile.armhf
View File

@ -1,16 +1,16 @@
FROM gradle:4.10 as buildstage
FROM openjdk:8-alpine as buildstage
ARG DAVOS_RELEASE
USER root
# Add qemu to build on x86_64 systems
COPY qemu-arm-static /usr/bin
RUN \
echo "**** Install build requirements ****" && \
apt-get update && apt-get install -y jq && \
apk add \
bash \
curl \
jq && \
echo "**** Download Davos ****" && \
if [ -z ${DAVOS_RELEASE+x} ]; then \
DAVOS_RELEASE=$(curl -sX GET https://api.github.com/repos/linuxserver/davos/releases/latest \
| jq -r '. | .tag_name'); \
DAVOS_RELEASE=$(curl -sX GET https://api.github.com/repos/linuxserver/davos/releases/latest \
| jq -r '. | .tag_name'); \
fi && \
curl -o \
/tmp/davos.tar.gz -L \
@ -19,10 +19,10 @@ RUN \
mkdir -p \
/app/davos-test/ && \
tar xf \
/tmp/davos.tar.gz -C \
/app/davos-test/ --strip-components=1 && \
/tmp/davos.tar.gz -C \
/app/davos-test/ --strip-components=1 && \
cd /app/davos-test/ && \
gradle build cucumber && \
./gradlew build cucumber && \
echo "**** Build Davos For Release ****" && \
mkdir -p \
/app/davos/ && \
@ -30,7 +30,7 @@ RUN \
/tmp/davos.tar.gz -C \
/app/davos/ --strip-components=1 && \
cd /app/davos/ && \
gradle clean build && \
./gradlew -Penv=release clean build && \
echo "**** Copy Finished Jar ****" && \
cp build/libs/*.jar /davos.jar && \
chmod 755 /davos.jar
@ -38,21 +38,19 @@ RUN \
FROM lsiobase/alpine.armhf:3.9
# Add qemu to build on x86_64 systems
COPY qemu-arm-static /usr/bin
# set version label
ARG BUILD_DATE
ARG VERSION
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL maintainer="JAGFin1,Thelamer"
# Add qemu to build on x86_64 systems
COPY qemu-arm-static /usr/bin
# install packages
RUN \
apk add --no-cache \
curl && \
apk add --no-cache \
--repository http://nl.alpinelinux.org/alpine/edge/community \
curl \
openjdk8-jre
# copy files from build stage and local files

1
README.md
View File

@ -158,5 +158,6 @@ Below are the instructions for updating containers:
## Versions
* **08.03.19:** - Updating build environment to pass proper build flags and use gradle wrapper.
* **22.02.19:** - Rebasing to alpine 3.9.
* **18.11.16:** - Initial Release.

1
readme-vars.yml
View File

@ -32,5 +32,6 @@ app_setup_block: |
# changelog
changelogs:
- { date: "08.03.19:", desc: "Updating build environment to pass proper build flags and use gradle wrapper." }
- { date: "22.02.19:", desc: "Rebasing to alpine 3.9." }
- { date: "18.11.16:", desc: "Initial Release." }