[go: up one dir, main page]
Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improved Docker pkgbuild #824

Merged
merged 15 commits into from
Feb 10, 2019
Merged

Improved Docker pkgbuild #824

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
d351fa0
Make Fedora package.sh script use bash
joshuaboniface Feb 4, 2019
546f4cd
Add prerequisite keep_artifacts var
joshuaboniface Feb 5, 2019
c846da4
Update Debian package build
joshuaboniface Feb 5, 2019
88038d9
Update Fedora package build
joshuaboniface Feb 5, 2019
8413c56
Update CentOS package build
joshuaboniface Feb 6, 2019
ceb8b9f
Add explanation to usage output
joshuaboniface Feb 6, 2019
e1d523e
Improve description of keep_artifacts flag
joshuaboniface Feb 6, 2019
da860e6
Remove superfluous VERSION variables
joshuaboniface Feb 9, 2019
139e3c1
Replace symlinks with copies and update image name
joshuaboniface Feb 9, 2019
37985c2
Update image name
joshuaboniface Feb 9, 2019
3014866
Add similar Ubuntu build package
joshuaboniface Feb 9, 2019
7be4a85
Use Microsoft dotnet Docker images
joshuaboniface Feb 10, 2019
57cefb4
Combine various RUNs in Fedora/CentOS
joshuaboniface Feb 10, 2019
00234a5
Remove superfluous comments
joshuaboniface Feb 10, 2019
fb256b7
Fix control file for Microsoft Docker setup
joshuaboniface Feb 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use Microsoft dotnet Docker images
  • Loading branch information
@joshuaboniface
joshuaboniface committed Feb 10, 2019
commit 7be4a8500c29d58dff9af5a3bf85edeb5d6b73b6
24 changes: 4 additions & 20 deletions deployment/debian-package-x64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,18 @@
FROM debian:9
FROM microsoft/dotnet:2.2-sdk-stretch
# Docker build arguments
ARG SOURCE_DIR=/jellyfin
ARG PLATFORM_DIR=/jellyfin/deployment/debian-package-x64
ARG ARTIFACT_DIR=/dist
ARG SDK_VERSION=2.2
# Docker run environment
ENV SOURCE_DIR=/jellyfin
ENV ARTIFACT_DIR=/dist
ENV DEB_BUILD_OPTIONS=noddebs

# Prepare Debian build environment
RUN apt-get update \
&& apt-get install -y apt-transport-https debhelper gnupg wget devscripts mmv libc6-dev libcurl4-openssl-dev libfontconfig1-dev libfreetype6-dev

# Install dotnet repository
# https://dotnet.microsoft.com/download/linux-package-manager/debian9/sdk-current
RUN wget -qO- https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.asc.gpg \
&& mv microsoft.asc.gpg /etc/apt/trusted.gpg.d/ \
&& wget -q https://packages.microsoft.com/config/debian/9/prod.list \
&& mv prod.list /etc/apt/sources.list.d/microsoft-prod.list \
&& chown root:root /etc/apt/trusted.gpg.d/microsoft.asc.gpg \
&& chown root:root /etc/apt/sources.list.d/microsoft-prod.list \
&& apt-get update \
&& apt-get install -y dotnet-sdk-${SDK_VERSION}

# Link to docker-build script
RUN ln -sf ${PLATFORM_DIR}/docker-build.sh /docker-build.sh

# Link to Debian source dir; mkdir needed or it fails, can't force dest
RUN mkdir -p ${SOURCE_DIR} && ln -sf ${PLATFORM_DIR}/pkg-src ${SOURCE_DIR}/debian
&& apt-get install -y apt-transport-https debhelper gnupg wget devscripts mmv libc6-dev libcurl4-openssl-dev libfontconfig1-dev libfreetype6-dev \
&& ln -sf ${PLATFORM_DIR}/docker-build.sh /docker-build.sh \
&& mkdir -p ${SOURCE_DIR} && ln -sf ${PLATFORM_DIR}/pkg-src ${SOURCE_DIR}/debian

# Prepare artifact volume
VOLUME ${ARTIFACT_DIR}/
Expand Down
26 changes: 5 additions & 21 deletions deployment/ubuntu-package-x64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,18 @@
FROM ubuntu:18.04
FROM microsoft/dotnet:2.2-sdk-bionic
# Docker build arguments
ARG SOURCE_DIR=/jellyfin
ARG PLATFORM_DIR=/jellyfin/deployment/ubuntu-package-x64
ARG ARTIFACT_DIR=/dist
ARG SDK_VERSION=2.2
# Docker run environment
ENV SOURCE_DIR=/jellyfin
ENV ARTIFACT_DIR=/dist
ENV DEB_BUILD_OPTIONS=noddebs

# Prepare Debian build environment
# Prepare Ubuntu build environment
RUN apt-get update \
&& apt-get install -y apt-transport-https debhelper gnupg wget devscripts mmv libc6-dev libcurl4-openssl-dev libfontconfig1-dev libfreetype6-dev

# Install dotnet repository
# https://dotnet.microsoft.com/download/linux-package-manager/debian9/sdk-current
RUN wget -qO- https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.asc.gpg \
&& mv microsoft.asc.gpg /etc/apt/trusted.gpg.d/ \
&& wget -q https://packages.microsoft.com/config/ubuntu/18.04/prod.list \
&& mv prod.list /etc/apt/sources.list.d/microsoft-prod.list \
&& chown root:root /etc/apt/trusted.gpg.d/microsoft.asc.gpg \
&& chown root:root /etc/apt/sources.list.d/microsoft-prod.list \
&& apt-get update \
&& apt-get install -y dotnet-sdk-${SDK_VERSION}

# Link to docker-build script
RUN ln -sf ${PLATFORM_DIR}/docker-build.sh /docker-build.sh

# Link to Debian source dir; mkdir needed or it fails, can't force dest
RUN mkdir -p ${SOURCE_DIR} && ln -sf ${PLATFORM_DIR}/pkg-src ${SOURCE_DIR}/debian
&& apt-get install -y apt-transport-https debhelper gnupg wget devscripts mmv libc6-dev libcurl4-openssl-dev libfontconfig1-dev libfreetype6-dev \
&& ln -sf ${PLATFORM_DIR}/docker-build.sh /docker-build.sh \
&& mkdir -p ${SOURCE_DIR} && ln -sf ${PLATFORM_DIR}/pkg-src ${SOURCE_DIR}/debian

# Prepare artifact volume
VOLUME ${ARTIFACT_DIR}/
Expand Down