From ce79a74de050c33a13b085b9ac32095b873ab1dc Mon Sep 17 00:00:00 2001 From: tobbenb Date: Mon, 29 Apr 2019 00:33:23 +0200 Subject: [PATCH] Add revision check, so pipeline can build new revisions --- Dockerfile | 5 ++++- Dockerfile.aarch64 | 3 +++ Dockerfile.armhf | 3 +++ README.md | 1 + readme-vars.yml | 1 + 5 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a62be2c..89d1f84 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM lsiobase/alpine:3.8 # set version label ARG BUILD_DATE -ARG VERSION +ARG OSCAM_VERSION LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="saarg" @@ -29,6 +29,9 @@ RUN \ pcsc-lite \ pcsc-lite-libs && \ echo "**** compile oscam ****" && \ + if [ -z ${OSCAM_VERSION+x} ]; then \ + OSCAM_VERSION=$(svn info --show-item revision http://www.streamboard.tv/svn/oscam/trunk ); \ + fi && \ svn checkout http://www.streamboard.tv/svn/oscam/trunk /tmp/oscam-svn && \ cd /tmp/oscam-svn && \ ./config.sh \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 78de16e..272fd72 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -29,6 +29,9 @@ RUN \ pcsc-lite \ pcsc-lite-libs && \ echo "**** compile oscam ****" && \ + if [ -z ${OSCAM_VERSION+x} ]; then \ + OSCAM_VERSION=$(svn info --show-item revision http://www.streamboard.tv/svn/oscam/trunk ); \ + fi && \ svn checkout http://www.streamboard.tv/svn/oscam/trunk /tmp/oscam-svn && \ cd /tmp/oscam-svn && \ ./config.sh \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 80c4bb7..397e66b 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -29,6 +29,9 @@ RUN \ pcsc-lite \ pcsc-lite-libs && \ echo "**** compile oscam ****" && \ + if [ -z ${OSCAM_VERSION+x} ]; then \ + OSCAM_VERSION=$(svn info --show-item revision http://www.streamboard.tv/svn/oscam/trunk ); \ + fi && \ svn checkout http://www.streamboard.tv/svn/oscam/trunk /tmp/oscam-svn && \ cd /tmp/oscam-svn && \ ./config.sh \ diff --git a/README.md b/README.md index 5aa7a07..7ddae32 100644 --- a/README.md +++ b/README.md @@ -182,6 +182,7 @@ Below are the instructions for updating containers: ## Versions +* **29.04.19:** - Add revision check, so pipeline can build new revisions. * **28.04.19:** - Switch back to streamboard svn to fix version not showing in UI. * **23.03.19:** - Switching to new Base images, shift to arm32v7 tag. * **19.02.19:** - Add pipeline logic and multi arch, rebase to Alpine 3.8. diff --git a/readme-vars.yml b/readme-vars.yml index 4b7280f..f51609b 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -73,6 +73,7 @@ app_setup_block: | # changelog changelogs: + - { date: "29.04.19:", desc: "Add revision check, so pipeline can build new revisions." } - { date: "28.04.19:", desc: "Switch back to streamboard svn to fix version not showing in UI." } - { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." } - { date: "19.02.19:", desc: "Add pipeline logic and multi arch, rebase to Alpine 3.8." }