Commit Graph

66 Commits

Author SHA1 Message Date
Matt
994481213f Add root certificates to docker image 2020-02-01 11:02:44 -05:00
Narfinger
c3ff4e0b9f fixes dockerfile building on recent linux installations 2020-01-10 19:42:07 +09:00
Bond_009
c8f403238e Move to .Net Core 3.1 2019-12-06 21:28:47 +01:00
Joshua M. Boniface
84009b534d
Merge pull request #1937 from justinfenn/docker-entrypoint-exec
use exec form for Dockerfile entrypoint
2019-11-17 17:29:55 -05:00
Steve Hayles
b1e65c6cd4
Adding OpenSSL library
Depending on configuration the docker container may need OpenSSL to support https access
2019-10-28 08:22:59 +00:00
Steve Hayles
26ce62d318
Update Dockerfile
debian-stretch packages were missing for libva-drm2 so would not build

the base image mcr.microsoft.com/dotnet/core/sdk:${DOTNET_VERSION} is incorrectly referencing .NET Core 3-preview6 which will cause issues at runtime with library references being mismatched
2019-10-27 20:22:17 +00:00
Justin Fenn
435c30aed9 use exec form for Dockerfile entrypoint
This causes the jellyfin process to be pid 1 in the container.  It can
receive signals like SIGTERM (from "docker stop", for example) and shut
down properly.
2019-10-27 12:28:56 -07:00
Bond_009
f1167ace7e Use the correct dotnet runtime in Docker images
The self contained packages already contains the dotnet runtime
No need to use the dotnet runtime base image.

This should decrease the size of the image.
2019-10-25 18:04:01 +02:00
Andrew Rabert
4ace99ad76 Fix Docker ffmpeg 2019-10-19 21:01:01 -04:00
Andrew Rabert
64eca9e1c7 Update Docker containers to dotnet 3.0 2019-10-19 19:36:56 -04:00
Andrew Rabert
cd3c14961f Default to jellyfin-web master 2019-10-19 19:32:19 -04:00
Joshua Boniface
fffc5e3a6f Bump version to 10.5.0 for next stable release 2019-10-11 20:12:52 -04:00
Joshua Boniface
abde7c0242 Make the comment nicer 2019-10-05 18:38:55 -04:00
Joshua Boniface
762d17c3df Move copy steps further so they're not overwriting 2019-10-05 18:24:38 -04:00
Joshua M. Boniface
75b7c9ac36 Do explicit dotnet publish in Dockerfiles (#1801)
The common.build.sh script was removed in #1793 but the Dockerfiles
still used this to perform the dotnet publish. Remove that call and do
the publish explicitly.
2019-09-27 23:02:18 -04:00
Erwin de Haan
0ca0d9d01e Remove submodule and add clone and build to CI 2019-09-24 16:22:26 +02:00
nevado
cb32bf1c4f Add mesa-va-drivers to main Dockerfile (#1727) 2019-09-15 00:31:13 -04:00
Andrew Rabert
03f32978c0 Docker - Build jellyfin-web 2019-09-12 18:24:09 -04:00
Joshua M. Boniface
2aecc3fa1b
Merge pull request #1699 from joshuaboniface/bump-version
Bump version to 10.4.0
2019-09-02 20:03:31 -04:00
Andrew Rabert
11346c000e Fix default build arg 2019-09-02 15:13:08 -04:00
Joshua Boniface
742102b541 Bump version to 10.4.0 2019-08-31 21:39:10 -04:00
Andrew Rabert
1c4755f26a docker - make ffmpeg version configurable 2019-08-31 13:26:13 -04:00
Andrew Rabert
da01376294 Fix Docker build 2019-08-06 23:57:39 -04:00
Andrew Rabert
358665d944 Docker - make web version more configurable
This allows for building against jellyfin-web master. Ex.

docker build . --build-arg JELLYFIN_WEB_VERSION=master
2019-08-01 01:03:52 -04:00
Joshua M. Boniface
595a68b822 Bump version for 10.3.7 2019-07-24 10:48:35 -04:00
Joshua M. Boniface
b3f9d04501 Bump version for 10.3.6 2019-07-06 13:34:38 -04:00
Joshua M. Boniface
d5fe82314e Bump version for 10.3.5 2019-06-09 21:47:45 -04:00
Joshua M. Boniface
855911333a Bump version for 10.3.4 2019-06-06 22:45:37 -04:00
Joshua M. Boniface
1bf3a26a61 Bump version for 10.3.3 2019-05-17 23:12:21 -04:00
Joshua Boniface
e8196fed7c Bump version for 10.3.2 2019-04-30 20:18:54 -04:00
Joshua Boniface
5fb4922c6f Bump version to 10.3.1 2019-04-20 14:24:40 -04:00
Joshua Boniface
46c37c0ae8 Bump version to 10.3.0 (release) 2019-04-19 14:25:29 -04:00
Joshua Boniface
65bff1181a Bump version to 10.3.0-rc2 and update submodule 2019-04-10 00:51:21 -04:00
Andrew Rabert
d75324afc9 Update Dockerfiles
* Use new dotnet image paths
* Update jellyfin-web to 10.3.0-rc1
2019-04-03 01:21:28 -04:00
Sandro Jäckel
dd929d796f
Only remove /var/lib/apt/lists/* 2019-03-15 14:30:15 +01:00
PloughPuff
b864e9da2a Finalise removal of --ffprobe switch
Removed --ffprobe from src files and server/docker scripts.
2019-03-12 22:09:18 +00:00
Andrew Rabert
27f9981142 Treat jellyfin-web as just another dependency for Docker builds 2019-03-01 00:17:46 -05:00
Andrew Rabert
1d1e6dede9 Set ffmpeg+ffprobe paths in Docker container
Will always ensure containers use correct path.

Yes - the arm images have a different path than the amd64 one. This is
caused by the amd64 image using ffmpeg from jellyfin/ffmpeg while the
others use ffmpeg from their distro's repos.
2019-02-27 21:04:37 -05:00
Thomas Büttner
38ec68c488
use common.build.sh for docker image builds
Signed-off-by: Thomas Büttner <thomas@vergesslicher.tech>
2019-02-24 11:17:39 +01:00
Thomas Büttner
da61998ad6
Build releases without debug
Signed-off-by: Thomas Büttner <thomas@vergesslicher.tech>
2019-02-24 11:00:15 +01:00
Andrew Rabert
69a81c0bc2 Use jellyfin/ffmpeg image 2019-02-20 12:11:50 -05:00
Andrew Rabert
c06598635f Fix cachedir missing from Docker container
Adds the /cache volume and set it to writeable by all. This allows for
those using jellyfin to continue using it without modifying their
config. However, retaining cache will require one to mount the /cache
volume.

Also make the /config and /media dirs 777 by default. No permissions on
mounted volumes will be changed.
2019-02-16 15:25:44 -05:00
Andrew Rabert
d9ab654abe Enhance Dockerfiles
* Prevent failure when obj exists from host compile
* Enhance readability of disposed stages
* Formatting
2019-02-16 01:37:55 -05:00
Andrew Rabert
22ffc5aee4 Use VAAPI-enabled ffmpeg 2019-02-08 00:19:31 -05:00
Sparky
1d94607a30 Fix docker args
After the change to runtime args in #749 docker broke.

This fixes it.
2019-02-02 15:17:59 +01:00
Andrew Rabert
cc3422b96b Use ffmpeg from jrottenberg/ffmpeg
Eventually would like to move to his 4.0-vaapi image
2019-01-26 21:16:43 -05:00
Sparky
9f83ee7b3e Make another docker layer reusable
By moving the apt-get layer before the copies, the apt-get layer can be reused with each build, reducing upload/download needed during updates.

Just a small optimization.
2019-01-25 13:27:12 -05:00
Sparky
d00e43735f Really slim down Docker container
#606 didn't actually run the new commands due to the comments position.

This fixes the comment location.
2019-01-18 10:26:02 -05:00
Sparky
fe4c3fddb4 Slim down docker image
After installing, remove package caches and clean up after installation of stuff.
2019-01-17 18:59:52 -05:00
Erwin de Haan
ae0732136f Merge remote-tracking branch 'upstream/dev' into build-system-consolidation 2019-01-13 23:28:05 +01:00