rebase to bionic update webgrab to latest versions

This commit is contained in:
thelamer 2019-05-28 11:57:01 -07:00
parent 323adb8bee
commit f736117960
7 changed files with 33 additions and 19 deletions

View File

@ -1,4 +1,4 @@
FROM lsiobase/ubuntu:xenial
FROM lsiobase/ubuntu:bionic
# set version label
ARG BUILD_DATE
@ -7,8 +7,8 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
LABEL maintainer="saarg"
# package versions
ARG WEBGRAB_VER="2.0.0"
ARG WGUPDATE_VER="2.1.7_beta"
ARG WEBGRAB_VER="2.1.0"
ARG WGUPDATE_VER="2.1.9_beta"
# environment variables.
ARG DEBIAN_FRONTEND="noninteractive"
@ -16,8 +16,11 @@ ENV HOME /config
RUN \
echo "**** add mono repository ****" && \
apt-get update && \
apt-get install -y \
gnupg && \
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF && \
echo "deb http://download.mono-project.com/repo/ubuntu xenial main" | tee /etc/apt/sources.list.d/mono-official.list && \
echo "deb http://download.mono-project.com/repo/ubuntu bionic main" | tee /etc/apt/sources.list.d/mono-official.list && \
echo "**** install packages ****" && \
apt-get update && \
apt-get install -y \

View File

@ -1,4 +1,4 @@
FROM lsiobase/ubuntu:arm64v8-xenial
FROM lsiobase/ubuntu:arm64v8-bionic
# set version label
ARG BUILD_DATE
@ -7,8 +7,8 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
LABEL maintainer="saarg"
# package versions
ARG WEBGRAB_VER="2.0.0"
ARG WGUPDATE_VER="2.1.7_beta"
ARG WEBGRAB_VER="2.1.0"
ARG WGUPDATE_VER="2.1.9_beta"
# environment variables.
ARG DEBIAN_FRONTEND="noninteractive"
@ -16,8 +16,11 @@ ENV HOME /config
RUN \
echo "**** add mono repository ****" && \
apt-get update && \
apt-get install -y \
gnupg && \
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF && \
echo "deb http://download.mono-project.com/repo/ubuntu xenial main" | tee /etc/apt/sources.list.d/mono-official.list && \
echo "deb http://download.mono-project.com/repo/ubuntu bionic main" | tee /etc/apt/sources.list.d/mono-official.list && \
echo "**** install packages ****" && \
apt-get update && \
apt-get install -y \

View File

@ -1,4 +1,4 @@
FROM lsiobase/ubuntu:arm32v7-xenial
FROM lsiobase/ubuntu:arm32v7-bionic
# set version label
ARG BUILD_DATE
@ -7,8 +7,8 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
LABEL maintainer="saarg"
# package versions
ARG WEBGRAB_VER="2.0.0"
ARG WGUPDATE_VER="2.1.7_beta"
ARG WEBGRAB_VER="2.1.0"
ARG WGUPDATE_VER="2.1.9_beta"
# environment variables.
ARG DEBIAN_FRONTEND="noninteractive"
@ -16,8 +16,11 @@ ENV HOME /config
RUN \
echo "**** add mono repository ****" && \
apt-get update && \
apt-get install -y \
gnupg && \
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF && \
echo "deb http://download.mono-project.com/repo/ubuntu xenial main" | tee /etc/apt/sources.list.d/mono-official.list && \
echo "deb http://download.mono-project.com/repo/ubuntu bionic main" | tee /etc/apt/sources.list.d/mono-official.list && \
echo "**** install packages ****" && \
apt-get update && \
apt-get install -y \

14
Jenkinsfile vendored
View File

@ -99,12 +99,14 @@ pipeline {
/* ########################
External Release Tagging
######################## */
// If this is an os release set release type to none to indicate no external release
stage("Set ENV os"){
// If this is a custom command to determine version use that command
stage("Set tag custom bash"){
steps{
script{
env.EXT_RELEASE = env.PACKAGE_TAG
env.RELEASE_LINK = 'none'
env.EXT_RELEASE = sh(
script: ''' echo V2.1.0 ''',
returnStdout: true).trim()
env.RELEASE_LINK = 'custom_command'
}
}
}
@ -592,11 +594,11 @@ pipeline {
"tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' '''
echo "Pushing New release for Tag"
sh '''#! /bin/bash
echo "Updating base packages to ${PACKAGE_TAG}" > releasebody.json
echo "Updating to ${EXT_RELEASE_CLEAN}" > releasebody.json
echo '{"tag_name":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\
"target_commitish": "master",\
"name": "'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\
"body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n**OS Changes:**\\n\\n' > start
"body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n**Remote Changes:**\\n\\n' > start
printf '","draft": false,"prerelease": false}' >> releasebody.json
paste -d'\\0' start releasebody.json > releasebody.json.done
curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done'''

View File

@ -199,6 +199,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions
* **28.05.19:** - Update to v2.1.0 and beta v2.1.9, rebase to bionic.
* **23.03.19:** - Switching to new Base images, shift to arm32v7 tag.
* **21.03.19:** - Update to beta 2.1.7.
* **19.02.19:** - Add pipeline logic and multi arch.

View File

@ -2,7 +2,8 @@
# jenkins variables
project_name: docker-webgrabplus
external_type: os
external_type: na
custom_version_command: 'echo V2.1.0'
release_type: stable
release_tag: latest
ls_branch: master

View File

@ -60,6 +60,7 @@ app_setup_block: |
# changelog
changelogs:
- { date: "28.05.19:", desc: "Update to v2.1.0 and beta v2.1.9, rebase to bionic." }
- { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." }
- { date: "21.03.19:", desc: "Update to beta 2.1.7." }
- { date: "19.02.19:", desc: "Add pipeline logic and multi arch." }