diff options
| author | Cody Robibero <cody@robibe.ro> | 2021-09-25 05:21:48 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-25 06:21:48 -0600 |
| commit | 4fc3de9b75e2b8ac9052271dca9aacf2bc6eed90 (patch) | |
| tree | c0cb7fef8aaf4dc16d987abae7a4b21d2e86347b /deployment/Dockerfile.centos.amd64 | |
| parent | e627b1b154a48ccc18dd50c5214799b41dd02f7a (diff) | |
Fix builds for dotnet6 (#6595)
* Target net6.0
* Use new Enum.TryParse(ReadOnlySpan<char>) overload
* Replace RNGCryptoServiceProvider with RandomNumberGenerator
* ci - target net6.0 (#6594)
* Update deployment for dotnet6
* Use generic 6.0.x preview for CI
* Update direct dotnet download links
Co-authored-by: Bond_009 <bond.009@outlook.com>
Diffstat (limited to 'deployment/Dockerfile.centos.amd64')
| -rw-r--r-- | deployment/Dockerfile.centos.amd64 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/deployment/Dockerfile.centos.amd64 b/deployment/Dockerfile.centos.amd64 index 326e995be..178f94f71 100644 --- a/deployment/Dockerfile.centos.amd64 +++ b/deployment/Dockerfile.centos.amd64 @@ -2,7 +2,6 @@ FROM centos:7 # Docker build arguments ARG SOURCE_DIR=/jellyfin ARG ARTIFACT_DIR=/dist -ARG SDK_VERSION=5.0 # Docker run environment ENV SOURCE_DIR=/jellyfin ENV ARTIFACT_DIR=/dist @@ -11,12 +10,13 @@ ENV IS_DOCKER=YES # Prepare CentOS environment RUN yum update -yq \ && yum install -yq epel-release \ - && yum install -yq @buildsys-build rpmdevtools yum-plugins-core libcurl-devel fontconfig-devel freetype-devel openssl-devel glibc-devel libicu-devel git + && yum install -yq @buildsys-build rpmdevtools yum-plugins-core libcurl-devel fontconfig-devel freetype-devel openssl-devel glibc-devel libicu-devel git wget # Install DotNET SDK -RUN rpm -Uvh https://packages.microsoft.com/config/rhel/7/packages-microsoft-prod.rpm \ - && rpmdev-setuptree \ - && yum install -yq dotnet-sdk-${SDK_VERSION} +RUN wget -q https://download.visualstudio.microsoft.com/download/pr/5fcb98bb-21e1-47a5-bb8e-bb25f41a3e52/04811d5d05b7e694f040d2a13c1aae4c/dotnet-sdk-6.0.100-rc.1.21463.6-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 # Create symlinks and directories RUN ln -sf ${SOURCE_DIR}/deployment/build.centos.amd64 /build.sh \ |