From 342c4810c61de374de55aebb1b22a31188d1fee2 Mon Sep 17 00:00:00 2001 From: thelamer Date: Mon, 23 Nov 2020 10:16:41 -0800 Subject: [PATCH] rebase to focal advertise bionic tag --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 2 +- README.md | 9 +++++++++ readme-vars.yml | 7 +++++++ 5 files changed, 19 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6e6d678..bd298e1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:bionic +FROM ghcr.io/linuxserver/baseimage-ubuntu:focal # set version label ARG BUILD_DATE diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index c815db0..1fe09cb 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-bionic +FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-focal # set version label ARG BUILD_DATE diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 7efa009..2c56acb 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-bionic +FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-focal # set version label ARG BUILD_DATE diff --git a/README.md b/README.md index a9bcad7..7211918 100644 --- a/README.md +++ b/README.md @@ -56,6 +56,14 @@ 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 with Focal baseimage | +| bionic | Stable releases with Bionic baseimage | ## Usage @@ -289,6 +297,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **23.11.20:** - Add Bionic branch make Focal default. * **03.05.20:** - Update exposed ports and example docs for bridge mode. * **23.03.20:** - Remove udev hack (no longer needed), suppress uuid error in log during first start. * **04.12.19:** - Add variable for setting PLEX_CLAIM. Remove `/transcode` volume mapping as it is now set via plex gui and defaults to a location under `/config`. diff --git a/readme-vars.yml b/readme-vars.yml index f4f31bc..c23b34d 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -14,6 +14,12 @@ available_architectures: - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"} - { arch: "{{ arch_armhf }}", tag: "arm32v7-latest"} +# development version +development_versions: true +development_versions_items: + - { tag: "latest", desc: "Stable releases with Focal baseimage" } + - { tag: "bionic", desc: "Stable releases with Bionic baseimage" } + # container parameters common_param_env_vars_enabled: true #PGID, PUID, etc param_container_name: "{{ project_name }}" @@ -100,6 +106,7 @@ app_setup_block: | # changelog changelogs: + - { date: "23.11.20:", desc: "Add Bionic branch make Focal default." } - { date: "03.05.20:", desc: "Update exposed ports and example docs for bridge mode." } - { date: "23.03.20:", desc: "Remove udev hack (no longer needed), suppress uuid error in log during first start." } - { date: "04.12.19:", desc: "Add variable for setting PLEX_CLAIM. Remove `/transcode` volume mapping as it is now set via plex gui and defaults to a location under `/config`." }