From b6ad9a54fe3ba8665c1addf9f8cb9219521c7e42 Mon Sep 17 00:00:00 2001 From: thelamer Date: Fri, 10 May 2019 12:52:53 -0700 Subject: [PATCH 1/2] rebase to bionic --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 2 +- README.md | 1 + readme-vars.yml | 1 + 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 05609b7..db4b7d7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM lsiobase/mono:xenial +FROM lsiobase/mono:bionic # set version label ARG BUILD_DATE diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index b67a46a..bb95284 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM lsiobase/mono:arm64v8-xenial +FROM lsiobase/mono:arm64v8-bionic # set version label ARG BUILD_DATE diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 8637f55..44f7d00 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM lsiobase/mono:arm32v7-xenial +FROM lsiobase/mono:arm32v7-bionic # set version label ARG BUILD_DATE diff --git a/README.md b/README.md index 5c53962..5c0d2b5 100644 --- a/README.md +++ b/README.md @@ -193,6 +193,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **10.05.19:** - Rebase to Bionic. * **23.03.19:** - Switching to new Base images, shift to arm32v7 tag. * **03.02.19:** - Add package version and package author, remove update folder. * **01.02.19:** - Multi arch images and pipeline build logic. diff --git a/readme-vars.yml b/readme-vars.yml index 97e04aa..8191ed1 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -50,6 +50,7 @@ app_setup_block: | # changelog changelogs: + - { date: "10.05.19:", desc: "Rebase to Bionic." } - { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." } - { date: "03.02.19:", desc: "Add package version and package author, remove update folder." } - { date: "01.02.19:", desc: "Multi arch images and pipeline build logic." } From 1c27895633afd24f77fa683fdfc94882f10217c2 Mon Sep 17 00:00:00 2001 From: thelamer Date: Fri, 17 May 2019 16:34:53 -0700 Subject: [PATCH 2/2] adding new branch to readme --- README.md | 20 ++++++++++---------- readme-vars.yml | 20 +++++++------------- 2 files changed, 17 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 5c0d2b5..4b0f92f 100644 --- a/README.md +++ b/README.md @@ -41,6 +41,16 @@ The architectures supported by this image are: | arm64 | arm64v8-latest | | armhf | arm32v7-latest | +## Version Tags + +This image provides various versions that are available via tags. `latest` tag usually provides the latest stable version. Others are considered under development and caution must be exercised when using them. + +| Tag | Description | +| :----: | --- | +| latest | Stable releases from Sonarr (currently v2) | +| develop | Development releases from Sonarr (currently v2) | +| preview | Preview releases from Sonarr (currently v3) | +| 5.14 | Stable Sonarr releases, but run on Mono 5.14 | ## Usage @@ -62,16 +72,6 @@ docker create \ linuxserver/sonarr ``` -### Version Tags - -This image provides various versions that are available via tags. `latest` tag usually provides the latest stable version. Others are considered under development and caution must be exercised when using them. - -| Tag | Description | -| :----: | --- | -| latest | stable builds from the master branch of sonarr (currently v2) | -| develop | development builds from the develop branch of sonarr (currently v2) | -| preview | preview builds from the phantom-develop branch of sonarr (currently v3) | - ### docker-compose diff --git a/readme-vars.yml b/readme-vars.yml index 8191ed1..c2102e5 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -14,19 +14,13 @@ available_architectures: - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"} - { arch: "{{ arch_armhf }}", tag: "arm32v7-latest"} -# Optional Block -optional_block_1: true -optional_block_1_items: - - | - ### Version Tags - - This image provides various versions that are available via tags. `latest` tag usually provides the latest stable version. Others are considered under development and caution must be exercised when using them. - - | Tag | Description | - | :----: | --- | - | latest | stable builds from the master branch of sonarr (currently v2) | - | develop | development builds from the develop branch of sonarr (currently v2) | - | preview | preview builds from the phantom-develop branch of sonarr (currently v3) | +# development version +development_versions: true +development_versions_items: + - { tag: "latest", desc: "Stable releases from Sonarr (currently v2)" } + - { tag: "develop", desc: "Development releases from Sonarr (currently v2)" } + - { tag: "preview", desc: "Preview releases from Sonarr (currently v3)" } + - { tag: "5.14", desc: "Stable Sonarr releases, but run on Mono 5.14" } # container parameters param_container_name: "{{ project_name }}"