Skip to content

Commit

Permalink
Build with noble instead of mantic #405 (#406)
Browse files Browse the repository at this point in the history
  • Loading branch information
GioF71 authored Aug 23, 2024
1 parent ddf143a commit d8a028b
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 19 deletions.
30 changes: 15 additions & 15 deletions .github/workflows/docker-multi-arch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
strategy:
fail-fast: false
matrix:
base: ["bookworm", "vanilla-bookworm", "mantic", "vanilla-mantic"]
base: ["bookworm", "vanilla-bookworm", "noble", "vanilla-noble"]

steps:
- name: Checkout
Expand All @@ -39,16 +39,16 @@ jobs:
declare -A vanilla_dict
vanilla_dict[bookworm]="no"
vanilla_dict[vanilla-bookworm]="yes"
vanilla_dict[mantic]="no"
vanilla_dict[vanilla-mantic]="yes"
vanilla_dict[noble]="no"
vanilla_dict[vanilla-noble]="yes"
is_vanilla=${vanilla_dict[${{ matrix.base }}]}
declare -A allows_amdv5_dict
allows_amdv5_dict[bookworm]="yes"
allows_amdv5_dict[vanilla-bookworm]="yes"
allows_amdv5_dict[mantic]="no"
allows_amdv5_dict[vanilla-mantic]="no"
allows_amdv5_dict[noble]="no"
allows_amdv5_dict[vanilla-noble]="no"
armv5_allowed=${allows_amdv5_dict[${{ matrix.base }}]}
Expand All @@ -60,14 +60,14 @@ jobs:
declare -A base_images_dict
base_images_dict[bookworm]="giof71/mpd-compiler:bookworm"
base_images_dict[vanilla-bookworm]="debian:bookworm-slim"
base_images_dict[mantic]="giof71/mpd-compiler:mantic"
base_images_dict[vanilla-mantic]="ubuntu:mantic"
base_images_dict[noble]="giof71/mpd-compiler:noble"
base_images_dict[vanilla-noble]="ubuntu:noble"
declare -A integer_upsampling_dict
integer_upsampling_dict[bookworm]="yes"
integer_upsampling_dict[vanilla-bookworm]="no"
integer_upsampling_dict[mantic]="yes"
integer_upsampling_dict[vanilla-mantic]="no"
integer_upsampling_dict[noble]="yes"
integer_upsampling_dict[vanilla-noble]="no"
integer_upsampling_support=${integer_upsampling_dict[${{ matrix.base }}]}
Expand All @@ -76,20 +76,20 @@ jobs:
declare -A upstream_image_from_matrix
upstream_image_from_matrix[bookworm]=debian:bookworm-slim
upstream_image_from_matrix[vanilla-bookworm]=debian:bookworm-slim
upstream_image_from_matrix[mantic]=ubuntu:mantic
upstream_image_from_matrix[vanilla-mantic]=ubuntu:mantic
upstream_image_from_matrix[noble]=ubuntu:noble
upstream_image_from_matrix[vanilla-noble]=ubuntu:noble
declare -A special_tags
special_tags[bookworm]="${image_name}:stable,${image_name}:latest"
special_tags[vanilla-bookworm]="${image_name}:vanilla-stable,${image_name}:vanilla-latest,${image_name}:vanilla"
special_tags[mantic]="${image_name}:ubuntu-current"
special_tags[vanilla-mantic]="${image_name}:vanilla-ubuntu-current"
special_tags[noble]="${image_name}:ubuntu-current"
special_tags[vanilla-noble]="${image_name}:vanilla-ubuntu-current"
declare -A mpd_version_dict
mpd_version_dict[bookworm]=0.23.15
mpd_version_dict[vanilla-bookworm]=0.23.12
mpd_version_dict[mantic]=0.23.15
mpd_version_dict[vanilla-mantic]=0.23.12
mpd_version_dict[noble]=0.23.15
mpd_version_dict[vanilla-noble]=0.23.14
# select mpd version
mpd_version=${mpd_version_dict["${distro_id}"]};
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/sync-readme.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ name: Sync README.md to Docker Hub

on:
push:
main:
branches:
- main

jobs:
sync-readme:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@ The `mpdscribble` version depends on the base image. See the following table:
Base Image|Tags|Compiled MPD version|Repo MPD version|MPDScribble version
:---|:---|:---|:---|:---
giof71/mpd-compiler:bookworm|**latest**, **stable**, bookworm|0.23.15|[0.23.12](https://packages.debian.org/bookworm/mpd)|[0.24](https://packages.debian.org/bookworm/mpdscribble)
giof71/mpd-compiler:mantic|mantic, ubuntu-current|0.23.15|[0.23.12](https://packages.ubuntu.com/mantic/mpd)|[0.24](https://packages.ubuntu.com/mantic/mpdscribble)
giof71/mpd-compiler:noble|noble, ubuntu-current|0.23.15|[0.23.14](https://packages.ubuntu.com/noble/mpd)|[0.25](https://packages.ubuntu.com/noble/mpdscribble)
debian:bookworm-slim|**vanilla-latest**, **vanilla-stable**, **vanilla**, vanilla-bookworm|-|[0.23.12](https://packages.debian.org/bookworm/mpd)|[0.24](https://packages.debian.org/bookworm/mpdscribble)
ubuntu:mantic|vanilla-mantic, vanilla-ubuntu-current|-|[0.23.12](https://packages.ubuntu.com/mantic/mpd)|[0.24](https://packages.ubuntu.com/mantic/mpdscribble)
ubuntu:noble|vanilla-noblr, vanilla-ubuntu-current|-|[0.23.14](https://packages.ubuntu.com/noble/mpd)|[0.25](https://packages.ubuntu.com/noble/mpdscribble)

## Usage

Expand Down
8 changes: 8 additions & 0 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,14 @@ declare -A base_image_tags

base_image_tags[local-bookworm]=giof71/mpd-compiler:local-bookworm
base_image_tags[local-bullseye]=giof71/mpd-compiler:local-bullseye
base_image_tags[local-noble]=giof71/mpd-compiler:local-noble
base_image_tags[local-mantic]=giof71/mpd-compiler:local-mantic
base_image_tags[local-lunar]=giof71/mpd-compiler:local-lunar
base_image_tags[local-kinetic]=giof71/mpd-compiler:local-kinetic
base_image_tags[local-jammy]=giof71/mpd-compiler:local-jammy
base_image_tags[bullseye]=giof71/mpd-compiler:bullseye
base_image_tags[bookworm]=giof71/mpd-compiler:bookworm
base_image_tags[noble]=giof71/mpd-compiler:noble
base_image_tags[mantic]=giof71/mpd-compiler:mantic
base_image_tags[lunar]=giof71/mpd-compiler:lunar
base_image_tags[kinetic]=giof71/mpd-compiler:kinetic
Expand All @@ -23,6 +25,7 @@ base_image_tags[vanilla-trixie]=debian:trixie-slim
base_image_tags[vanilla-bookworm]=debian:bookworm-slim
base_image_tags[vanilla-bullseye]=debian:bullseye-slim
base_image_tags[vanilla-buster]=debian:buster-slim
base_image_tags[vanilla-noble]=ubuntu:noble
base_image_tags[vanilla-mantic]=ubuntu:mantic
base_image_tags[vanilla-lunar]=ubuntu:lunar
base_image_tags[vanilla-kinetic]=ubuntu:kinetic
Expand All @@ -34,6 +37,7 @@ declare -A local_tag
local_tag[bookworm]=local-bookworm
local_tag[bullseye]=local-bullseye
local_tag[buster]=local-buster
local_tag[noble]=local-noble
local_tag[mantic]=local-mantic
local_tag[lunar]=local-lunar
local_tag[kinetic]=local-kinetic
Expand All @@ -43,6 +47,7 @@ local_tag[bionic]=local-bionic
local_tag[local-bookworm]=local-bookworm
local_tag[local-bullseye]=local-bullseye
local_tag[local-buster]=local-buster
local_tag[local-noble]=local-noble
local_tag[local-mantic]=local-mantic
local_tag[local-lunar]=local-lunar
local_tag[local-kinetic]=local-kinetic
Expand All @@ -53,6 +58,7 @@ local_tag[vanilla-sid]=local-vanilla-sid
local_tag[vanilla-trixie]=local-vanilla-trixie
local_tag[vanilla-bookworm]=local-vanilla-bookworm
local_tag[vanilla-bullseye]=local-vanilla-bullseye
local_tag[vanilla-noble]=local-vanilla-noble
local_tag[vanilla-mantic]=local-vanilla-mantic
local_tag[vanilla-lunar]=local-vanilla-lunar
local_tag[vanilla-buster]=local-vanilla-buster
Expand All @@ -64,12 +70,14 @@ local_tag[vanilla-bionic]=local-vanilla-bionic
declare -A integer_upsampling_support_dict
integer_upsampling_support_dict[local-bookworm]=yes
integer_upsampling_support_dict[local-bullseye]=yes
integer_upsampling_support_dict[local-noble]=yes
integer_upsampling_support_dict[local-mantic]=yes
integer_upsampling_support_dict[local-lunar]=yes
integer_upsampling_support_dict[local-kinetic]=yes
integer_upsampling_support_dict[local-jammy]=yes
integer_upsampling_support_dict[bookworm]=yes
integer_upsampling_support_dict[bullseye]=yes
integer_upsampling_support_dict[noble]=yes
integer_upsampling_support_dict[mantic]=yes
integer_upsampling_support_dict[lunar]=yes
integer_upsampling_support_dict[kinetic]=yes
Expand Down
2 changes: 1 addition & 1 deletion doc/change-history.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Date|Major Changes
:---|:---
2024-05-03|Add support for auto_update and auto_update_depth (see issue [#397](https://github.com/GioF71/mpd-alsa-docker/issues/397))
2024-08-23|Use ubuntu noble instead of mantic (see issue [#405](https://github.com/GioF71/mpd-alsa-docker/issues/405))
2024-03-15|Add support for ffmpeg decoder using `FFMPEG_ENABLED` (see issue [#389](https://github.com/GioF71/mpd-alsa-docker/issues/389))
2024-03-05|Add `NULL_OUTPUT_MIXER_TYPE` and doc updates (see issue [#385](https://github.com/GioF71/mpd-alsa-docker/issues/385))
2024-02-16|Completed support for resource limitation (see issue [#381](https://github.com/GioF71/mpd-alsa-docker/issues/381))
Expand Down

0 comments on commit d8a028b

Please sign in to comment.