Merge pull request #9 from linuxserver/ffmpeg
add ffmpeg and click'n'load port
This commit is contained in:
commit
9439c21a52
5 changed files with 10 additions and 2 deletions
|
@ -23,6 +23,7 @@ RUN \
|
||||||
echo "**** install packages ****" && \
|
echo "**** install packages ****" && \
|
||||||
apk add --no-cache \
|
apk add --no-cache \
|
||||||
curl \
|
curl \
|
||||||
|
ffmpeg \
|
||||||
libjpeg-turbo \
|
libjpeg-turbo \
|
||||||
p7zip \
|
p7zip \
|
||||||
py3-pip \
|
py3-pip \
|
||||||
|
|
|
@ -23,6 +23,7 @@ RUN \
|
||||||
echo "**** install packages ****" && \
|
echo "**** install packages ****" && \
|
||||||
apk add --no-cache \
|
apk add --no-cache \
|
||||||
curl \
|
curl \
|
||||||
|
ffmpeg \
|
||||||
libjpeg-turbo \
|
libjpeg-turbo \
|
||||||
p7zip \
|
p7zip \
|
||||||
py3-pip \
|
py3-pip \
|
||||||
|
|
|
@ -23,6 +23,7 @@ RUN \
|
||||||
echo "**** install packages ****" && \
|
echo "**** install packages ****" && \
|
||||||
apk add --no-cache \
|
apk add --no-cache \
|
||||||
curl \
|
curl \
|
||||||
|
ffmpeg \
|
||||||
libjpeg-turbo \
|
libjpeg-turbo \
|
||||||
p7zip \
|
p7zip \
|
||||||
py3-pip \
|
py3-pip \
|
||||||
|
|
|
@ -97,6 +97,7 @@ services:
|
||||||
- /path/to/downloads:/downloads
|
- /path/to/downloads:/downloads
|
||||||
ports:
|
ports:
|
||||||
- 8000:8000
|
- 8000:8000
|
||||||
|
- 9666:9666 #optional
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
```
|
```
|
||||||
|
|
||||||
|
@ -109,6 +110,7 @@ docker run -d \
|
||||||
-e PGID=1000 \
|
-e PGID=1000 \
|
||||||
-e TZ=Europe/London \
|
-e TZ=Europe/London \
|
||||||
-p 8000:8000 \
|
-p 8000:8000 \
|
||||||
|
-p 9666:9666 `#optional` \
|
||||||
-v /path/to/appdata/config:/config \
|
-v /path/to/appdata/config:/config \
|
||||||
-v /path/to/downloads:/downloads \
|
-v /path/to/downloads:/downloads \
|
||||||
--restart unless-stopped \
|
--restart unless-stopped \
|
||||||
|
@ -122,6 +124,7 @@ Container images are configured using parameters passed at runtime (such as thos
|
||||||
| Parameter | Function |
|
| Parameter | Function |
|
||||||
| :----: | --- |
|
| :----: | --- |
|
||||||
| `-p 8000` | Allows HTTP access to the application |
|
| `-p 8000` | Allows HTTP access to the application |
|
||||||
|
| `-p 9666` | Click'n'Load port. |
|
||||||
| `-e PUID=1000` | for UserID - see below for explanation |
|
| `-e PUID=1000` | for UserID - see below for explanation |
|
||||||
| `-e PGID=1000` | for GroupID - see below for explanation |
|
| `-e PGID=1000` | for GroupID - see below for explanation |
|
||||||
| `-e TZ=Europe/London` | Specify a timezone to use EG Europe/London |
|
| `-e TZ=Europe/London` | Specify a timezone to use EG Europe/London |
|
||||||
|
@ -237,5 +240,6 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
|
||||||
|
|
||||||
## Versions
|
## Versions
|
||||||
|
|
||||||
|
* **02.02.22:** - Add ffmpeg for the Youtube plugin.
|
||||||
* **24.01.22:** - Replace unrar with p7zip.
|
* **24.01.22:** - Replace unrar with p7zip.
|
||||||
* **24.01.22:** - Initial release.
|
* **24.01.22:** - Initial release.
|
||||||
|
|
|
@ -34,9 +34,9 @@ param_env_vars:
|
||||||
- { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London"}
|
- { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London"}
|
||||||
|
|
||||||
# optional params
|
# optional params
|
||||||
opt_param_usage_include_ports: false
|
opt_param_usage_include_ports: true
|
||||||
opt_param_ports:
|
opt_param_ports:
|
||||||
- { external_port: "7227", internal_port: "7227", port_desc: "pyLoad control port" }
|
- { external_port: "9666", internal_port: "9666", port_desc: "Click'n'Load port." }
|
||||||
|
|
||||||
|
|
||||||
# application setup block
|
# application setup block
|
||||||
|
@ -50,5 +50,6 @@ app_setup_block: |
|
||||||
|
|
||||||
# changelog
|
# changelog
|
||||||
changelogs:
|
changelogs:
|
||||||
|
- { date: "02.02.22:", desc: "Add ffmpeg for the Youtube plugin." }
|
||||||
- { date: "24.01.22:", desc: "Replace unrar with p7zip." }
|
- { date: "24.01.22:", desc: "Replace unrar with p7zip." }
|
||||||
- { date: "24.01.22:", desc: "Initial release." }
|
- { date: "24.01.22:", desc: "Initial release." }
|
||||||
|
|
Loading…
Add table
Reference in a new issue