diff --git a/Dockerfile b/Dockerfile index 668a206..08249de 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine:3.19 +FROM ghcr.io/linuxserver/baseimage-alpine:3.20 # set version label ARG BUILD_DATE @@ -35,6 +35,7 @@ RUN \ chown -R abc:abc ./ && \ su -s /bin/sh abc -c 'HOME=/tmp npm install --omit=dev' && \ npm link && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ rm -rf /app/mstream/save/sync && \ ln -s /config/sync /app/mstream/save/sync && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 22744b5..6dd5085 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.19 +FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20 # set version label ARG BUILD_DATE @@ -35,6 +35,7 @@ RUN \ chown -R abc:abc ./ && \ su -s /bin/sh abc -c 'HOME=/tmp npm install --omit=dev' && \ npm link && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ rm -rf /app/mstream/save/sync && \ ln -s /config/sync /app/mstream/save/sync && \ diff --git a/Jenkinsfile b/Jenkinsfile index 3fcfaaa..65a77a4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -34,8 +34,8 @@ pipeline { CI_PORT='3000' CI_SSL='false' CI_DELAY='120' - CI_DOCKERENV='TZ=US/Pacific' - CI_AUTH='user:password' + CI_DOCKERENV='' + CI_AUTH='' CI_WEBPATH='' } stages { diff --git a/README.md b/README.md index 2a5388e..7c34f10 100644 --- a/README.md +++ b/README.md @@ -85,7 +85,7 @@ services: - PGID=1000 - TZ=Etc/UTC volumes: - - /path/to/data:/config + - /path/to/mstream/data:/config - /path/to/music:/music ports: - 3000:3000 @@ -101,7 +101,7 @@ docker run -d \ -e PGID=1000 \ -e TZ=Etc/UTC \ -p 3000:3000 \ - -v /path/to/data:/config \ + -v /path/to/mstream/data:/config \ -v /path/to/music:/music \ --restart unless-stopped \ lscr.io/linuxserver/mstream:latest @@ -113,7 +113,7 @@ Containers are configured using parameters passed at runtime (such as those abov | Parameter | Function | | :----: | --- | -| `-p 3000` | The port for the mStream webinterface | +| `-p 3000` | The port for the mStream web interface | | `-e PUID=1000` | for UserID - see below for explanation | | `-e PGID=1000` | for GroupID - see below for explanation | | `-e TZ=Etc/UTC` | specify a timezone to use, see this [list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List). | @@ -281,6 +281,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **27.06.24:** - Rebase to Alpine 3.20. * **12.12.23:** - Rebase to Alpine 3.19, move binaries to /app. * **05.07.23:** - Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf) * **13.02.23:** - Rebase to Alpine 3.17, migrate to s6v3. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index e170628..75f882c 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -23,6 +23,6 @@ repo_vars: - CI_PORT='3000' - CI_SSL='false' - CI_DELAY='120' - - CI_DOCKERENV='TZ=US/Pacific' - - CI_AUTH='user:password' + - CI_DOCKERENV='' + - CI_AUTH='' - CI_WEBPATH='' diff --git a/readme-vars.yml b/readme-vars.yml index 4aaaccc..02b2986 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -12,11 +12,11 @@ available_architectures: param_container_name: "{{ project_name }}" param_usage_include_vols: true param_volumes: - - {vol_path: "/config", vol_host_path: "/path/to/data", desc: "mStream config"} + - {vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/data", desc: "mStream config"} - {vol_path: "/music", vol_host_path: "/path/to/music", desc: "Music location"} param_usage_include_ports: true param_ports: - - {external_port: "3000", internal_port: "3000", port_desc: "The port for the mStream webinterface"} + - {external_port: "3000", internal_port: "3000", port_desc: "The port for the mStream web interface"} # application setup block app_setup_block_enabled: true app_setup_block: | @@ -30,6 +30,7 @@ app_setup_block: | v4's `config.json` is not compatible with v5. Existing `config.json` will be renamed to `config.json.v4-bak` for your reference and a new default `config.json` will be created upon upgrade from v4 to v5. # changelog changelogs: + - {date: "27.06.24:", desc: "Rebase to Alpine 3.20."} - {date: "12.12.23:", desc: "Rebase to Alpine 3.19, move binaries to /app."} - {date: "05.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"} - {date: "13.02.23:", desc: "Rebase to Alpine 3.17, migrate to s6v3."}