mirror of
https://github.com/linuxserver/docker-mstream.git
synced 2026-02-20 04:55:34 +08:00
Merge pull request #15 from linuxserver/ffmpeg
rebase to 3.15, fix ffmpeg download
This commit is contained in:
commit
ffeb0535a0
@ -1,4 +1,4 @@
|
||||
FROM ghcr.io/linuxserver/baseimage-alpine:3.13
|
||||
FROM ghcr.io/linuxserver/baseimage-alpine:3.15
|
||||
|
||||
# set version label
|
||||
ARG BUILD_DATE
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.13
|
||||
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.15
|
||||
|
||||
# set version label
|
||||
ARG BUILD_DATE
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.13
|
||||
FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.15
|
||||
|
||||
# set version label
|
||||
ARG BUILD_DATE
|
||||
|
||||
@ -231,6 +231,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
|
||||
|
||||
## Versions
|
||||
|
||||
* **02.04.22:** - Rebase to alpine 3.15. Fix ffmpeg download.
|
||||
* **17.05.21:** - Deprecating the env vars `USER`, `PASSWORD` and `USE_JSON` as mStream v5 requires the use of `config.json`.
|
||||
* **23.01.21:** - Rebasing to alpine 3.13.
|
||||
* **01.06.20:** - Rebasing to alpine 3.12.
|
||||
|
||||
@ -37,6 +37,7 @@ app_setup_block: |
|
||||
|
||||
# changelog
|
||||
changelogs:
|
||||
- { date: "02.04.22:", desc: "Rebase to alpine 3.15. Fix ffmpeg download." }
|
||||
- { date: "17.05.21:", desc: "Deprecating the env vars `USER`, `PASSWORD` and `USE_JSON` as mStream v5 requires the use of `config.json`." }
|
||||
- { date: "23.01.21:", desc: "Rebasing to alpine 3.13." }
|
||||
- { date: "01.06.20:", desc: "Rebasing to alpine 3.12." }
|
||||
|
||||
@ -53,5 +53,6 @@ fi
|
||||
|
||||
# permissions
|
||||
chown abc:abc -R \
|
||||
/config
|
||||
/config \
|
||||
/opt/mstream/bin
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user