diff options
| author | Gauvino <68083474+Gauvino@users.noreply.github.com> | 2024-01-18 02:11:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-17 18:11:03 -0700 |
| commit | a884b1f7869436fb373d71106330ab1db79cee11 (patch) | |
| tree | 7ffb1457f880ab748719398ed5b792f59c89b80c /deployment/Dockerfile.fedora.amd64 | |
| parent | 4962eb5b432c28bc829d915c29becc57db20cf45 (diff) | |
Refactor Dockerfile and build (#10603)
* Fix fedora
* Fix RID Linux
* Fix package and image versions
* Fix buildling and optimize docker images
```
* Removed find obj
* Changed curl command and added gpg
* Added to Contributors
* Removed apt-transport-https package
* Removed RASPI
* Update Intel drivers version
* Update Dockerfile for CentOS, Fedora, and portable deployments
- Changed Jammy docker image to Built-in Jammy Microsoft .NET SDK image
- Switched from using "Yum" to "Dnf" for CentOS and Fedora
- Added "dnf clean all" and "rm -rf /var/cache/dnf" to the end of CentOS and Fedora Dockerfiles
- Added "apt-get clean", "apt-get autoremove", "rm -rf /var/lib/apt/lists/*" to the end of the Debian/Ubuntu Dockerfiles
- Added ${DOTNET_VERSION} in every Dockerfile except CentOS/Fedora
- Removed previous warning comment for dotnet publish build in parallel
- Arranged package installation
* Re-arranged Dockerfile package installation
* Re-align
* Remove curl
* Remove curl
Diffstat (limited to 'deployment/Dockerfile.fedora.amd64')
| -rw-r--r-- | deployment/Dockerfile.fedora.amd64 | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/deployment/Dockerfile.fedora.amd64 b/deployment/Dockerfile.fedora.amd64 index 66ead37d7d..75a6d1e649 100644 --- a/deployment/Dockerfile.fedora.amd64 +++ b/deployment/Dockerfile.fedora.amd64 @@ -1,7 +1,9 @@ FROM fedora:39 + # Docker build arguments ARG SOURCE_DIR=/jellyfin ARG ARTIFACT_DIR=/dist + # Docker run environment ENV SOURCE_DIR=/jellyfin ENV ARTIFACT_DIR=/dist @@ -9,21 +11,26 @@ ENV IS_DOCKER=YES # Prepare Fedora environment RUN dnf update -yq \ - && dnf install -yq @buildsys-build rpmdevtools git dnf-plugins-core libcurl-devel fontconfig-devel freetype-devel openssl-devel glibc-devel libicu-devel systemd wget make + && dnf install -yq \ + @buildsys-build rpmdevtools git \ + dnf-plugins-core libcurl-devel fontconfig-devel \ + freetype-devel openssl-devel glibc-devel \ + libicu-devel systemd wget make \ + && dnf clean all \ + && rm -rf /var/cache/dnf # Install DotNET SDK RUN wget -q https://download.visualstudio.microsoft.com/download/pr/5226a5fa-8c0b-474f-b79a-8984ad7c5beb/3113ccbf789c9fd29972835f0f334b7a/dotnet-sdk-8.0.100-linux-x64.tar.gz -O dotnet-sdk.tar.gz \ - && mkdir -p dotnet-sdk \ - && tar -xzf dotnet-sdk.tar.gz -C dotnet-sdk \ - && ln -s $( pwd )/dotnet-sdk/dotnet /usr/bin/dotnet - + && mkdir -p dotnet-sdk \ + && tar -xzf dotnet-sdk.tar.gz -C dotnet-sdk \ + && ln -s $( pwd )/dotnet-sdk/dotnet /usr/bin/dotnet # Create symlinks and directories RUN ln -sf ${SOURCE_DIR}/deployment/build.fedora.amd64 /build.sh \ - && mkdir -p ${SOURCE_DIR}/SPECS \ - && ln -s ${SOURCE_DIR}/fedora/jellyfin.spec ${SOURCE_DIR}/SPECS/jellyfin.spec \ - && mkdir -p ${SOURCE_DIR}/SOURCES \ - && ln -s ${SOURCE_DIR}/fedora ${SOURCE_DIR}/SOURCES + && mkdir -p ${SOURCE_DIR}/SPECS \ + && ln -s ${SOURCE_DIR}/fedora/jellyfin.spec ${SOURCE_DIR}/SPECS/jellyfin.spec \ + && mkdir -p ${SOURCE_DIR}/SOURCES \ + && ln -s ${SOURCE_DIR}/fedora ${SOURCE_DIR}/SOURCES VOLUME ${SOURCE_DIR}/ |