diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml index f6d52af..9f40db5 100644 --- a/.github/workflows/container.yml +++ b/.github/workflows/container.yml @@ -34,13 +34,14 @@ jobs: matrix: version: - 2.4.4 + - 2.5.0 variant: - debian - alpine env: DEFAULT_VARIANT: debian - DEFAULT_VERSION: 2.4.4 + DEFAULT_VERSION: 2.5.0 if: ${{ github.repository_owner == 'libretime' }} steps: diff --git a/Makefile b/Makefile index befecd3..21352a5 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSIONS = 2.4.4 +VERSIONS = 2.4.4 2.5.0 TARBALLS = $(foreach version,$(VERSIONS),icecast-$(version).tar.gz) IMAGE = ghcr.io/libretime/icecast diff --git a/README.md b/README.md index db32d7e..c12418c 100644 --- a/README.md +++ b/README.md @@ -5,14 +5,16 @@ This [project](https://github.com/libretime/icecast-docker) provide icecast cont While the image is under the LibreTime namespace, anyone can use it! This image will not add any LibreTime specific features, and will not deviate from upstream. ```bash -docker run -d -p 8000:8000 libretime/icecast:2.4.4 -docker run -d -p 8000:8000 ghcr.io/libretime/icecast:2.4.4 +docker run -d -p 8000:8000 libretime/icecast:2.5.0 +docker run -d -p 8000:8000 ghcr.io/libretime/icecast:2.5.0 ``` The following icecast tags are supported: -- `2.4.4-debian`, `2.4.4`, `debian`, `latest` -- `2.4.4-alpine`, `alpine` +- `2.4.4-debian`, `2.4.4` +- `2.4.4-alpine` +- `2.5.0-debian`, `2.5.0`, `debian`, `latest` +- `2.5.0-alpine`, `alpine` The following icecast tags are **not supported** anymore: @@ -24,7 +26,7 @@ The following icecast tags are **not supported** anymore: > You can use the following command to get an image sha256 digest: > > ```bash -> docker inspect --format='{{index .RepoDigests 0}}' ghcr.io/libretime/icecast:2.4.4 +> docker inspect --format='{{index .RepoDigests 0}}' ghcr.io/libretime/icecast:2.5.0 > ``` The default configuration file (`/etc/icecast.xml`) was updated with following changes: @@ -49,5 +51,5 @@ Or you can mount your own configuration file in the container: docker run -d \ -p 8000:8000 \ -v ./icecast.xml:/etc/icecast.xml \ - libretime/icecast:2.4.4 + libretime/icecast:2.5.0 ``` diff --git a/SHA512SUMS.txt b/SHA512SUMS.txt index de17ae9..8131ea4 100644 --- a/SHA512SUMS.txt +++ b/SHA512SUMS.txt @@ -1,2 +1,5 @@ e9ffb478cac2570891787455591d881a59185e067bb36f51706a7070cd9d82d80425ec8cf151f5ebb17d1b75654449fc760f8b82a1bb05f020b47ec09e46b4d0 icecast-2.4.4.tar.gz 5b0c002af61dc0f3ad08b024d823da711b8213f726ffdc659a73fe6d36e1f37ee4b57a280c0dfa72496a66dc33512a7d4e006711f23c7446ea8ef2151d4198b6 icecast-2.5-beta3.tar.gz +e68730efce8fdf25dceedcc1d3e62cf23e67b88dc6277acd81741de07c4abaf72a5320a8b274925597a7081b5424bd7adbb9f7f753ed11134ac19f1a4797f9fa icecast-2.5.0-rc1.tar.gz +fb3731c5f7a93d7c01c81f21d67a520e55aed2da9a5b1ccef5f56f32557e983bd7eaa32d3a20c6da554e785e1e5bbff48fb3f4a15956bb3762b1d1dd7c876165 icecast-2.5.0-rc2.tar.gz +d92ce5d8ae1cd011eaa8c7424adea744f35e5c2d3e8244d362743be1c6bbc8fc44d76d7a212cf1eebe79da9b7d83b2ed5ab8659fb97929af316674b5ddf590b5 icecast-2.5.0.tar.gz diff --git a/alpine.dockerfile b/alpine.dockerfile index d022259..861f721 100644 --- a/alpine.dockerfile +++ b/alpine.dockerfile @@ -11,7 +11,11 @@ RUN apk --no-cache add \ libxml2-dev \ libxslt-dev \ openssl-dev \ - speex-dev + speex-dev \ + $(if [ $VERSION = "2.5.0" ]; then echo \ + libigloo-dev \ + librhash-dev \ + ; fi) WORKDIR /build ADD icecast-$VERSION.tar.gz . @@ -36,7 +40,11 @@ RUN apk --no-cache add \ libxml2 \ libxslt \ openssl \ - speex + speex \ + $(if [ $VERSION = "2.5.0" ]; then echo \ + libigloo0 \ + librhash1 \ + ; fi) ENV USER=icecast diff --git a/debian.dockerfile b/debian.dockerfile index 2a6bdc2..b0f3c18 100644 --- a/debian.dockerfile +++ b/debian.dockerfile @@ -20,7 +20,11 @@ apt-get install -y --no-install-recommends \ libtheora-dev \ libvorbis-dev \ libxml2-dev \ - libxslt1-dev + libxslt1-dev \ + $(if [ $VERSION = "2.5.0" ]; then echo \ + libigloo-dev \ + librhash-dev \ + ; fi) rm -rf /var/lib/apt/lists/* EOF @@ -53,7 +57,11 @@ apt-get install -y --no-install-recommends \ libtheora0 \ libvorbis0a \ libxml2 \ - libxslt1.1 + libxslt1.1 \ + $(if [ $VERSION = "2.5.0" ]; then echo \ + libigloo0t64 \ + librhash1 \ + ; fi) rm -rf /var/lib/apt/lists/* EOF diff --git a/icecast-2.5.0.tar.gz b/icecast-2.5.0.tar.gz new file mode 100644 index 0000000..cc215af --- /dev/null +++ b/icecast-2.5.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d9aa07c7429aec19d950ff6fd425c371f77158cd34ff220fc191b2c186c67c7a +size 1605985