diff options
| author | Joshua Boniface <joshua@boniface.me> | 2019-02-09 19:06:27 -0500 |
|---|---|---|
| committer | Joshua Boniface <joshua@boniface.me> | 2019-02-09 19:06:27 -0500 |
| commit | 57cefb432a052eb3d10019cf219a0eb8a5dfe088 (patch) | |
| tree | 6cf05cdeeec9c4564cc476f8d05e6d1cdf9c8110 /deployment | |
| parent | 7be4a8500c29d58dff9af5a3bf85edeb5d6b73b6 (diff) | |
Combine various RUNs in Fedora/CentOS
Diffstat (limited to 'deployment')
| -rw-r--r-- | deployment/centos-package-x64/Dockerfile | 16 | ||||
| -rw-r--r-- | deployment/fedora-package-x64/Dockerfile | 16 |
2 files changed, 10 insertions, 22 deletions
diff --git a/deployment/centos-package-x64/Dockerfile b/deployment/centos-package-x64/Dockerfile index 89799bca2..4cb288c84 100644 --- a/deployment/centos-package-x64/Dockerfile +++ b/deployment/centos-package-x64/Dockerfile @@ -13,17 +13,11 @@ RUN yum update -y \ && yum install -y @buildsys-build rpmdevtools yum-plugins-core libcurl-devel fontconfig-devel freetype-devel openssl-devel glibc-devel libicu-devel \ && rpm -Uvh https://packages.microsoft.com/config/rhel/7/packages-microsoft-prod.rpm \ && rpmdev-setuptree \ - && yum install -y dotnet-sdk-${SDK_VERSION} - -# Link to docker-build script -RUN ln -sf ${PLATFORM_DIR}/docker-build.sh /docker-build.sh - -# Link to RPM spec; mkdir needed or it fails, can't force dest -RUN mkdir -p ${SOURCE_DIR}/SPECS \ - && ln -s ${PLATFORM_DIR}/pkg-src/jellyfin.spec ${SOURCE_DIR}/SPECS/jellyfin.spec - -# Link to RPM sources; mkdir needed or it fails, can't force dest -RUN mkdir -p ${SOURCE_DIR}/SOURCES \ + && yum install -y dotnet-sdk-${SDK_VERSION} \ + && ln -sf ${PLATFORM_DIR}/docker-build.sh /docker-build.sh \ + && mkdir -p ${SOURCE_DIR}/SPECS \ + && ln -s ${PLATFORM_DIR}/pkg-src/jellyfin.spec ${SOURCE_DIR}/SPECS/jellyfin.spec \ + && mkdir -p ${SOURCE_DIR}/SOURCES \ && ln -s ${PLATFORM_DIR}/pkg-src ${SOURCE_DIR}/SOURCES # Prepare artifact volume diff --git a/deployment/fedora-package-x64/Dockerfile b/deployment/fedora-package-x64/Dockerfile index 7decba2e9..944f489b5 100644 --- a/deployment/fedora-package-x64/Dockerfile +++ b/deployment/fedora-package-x64/Dockerfile @@ -13,17 +13,11 @@ RUN dnf update -y \ && dnf install -y @buildsys-build rpmdevtools dnf-plugins-core libcurl-devel fontconfig-devel freetype-devel openssl-devel glibc-devel libicu-devel \ && dnf copr enable -y @dotnet-sig/dotnet \ && rpmdev-setuptree \ - && dnf install -y dotnet-sdk-${SDK_VERSION} - -# Link to docker-build script -RUN ln -sf ${PLATFORM_DIR}/docker-build.sh /docker-build.sh - -# Link to RPM spec; mkdir needed or it fails, can't force dest -RUN mkdir -p ${SOURCE_DIR}/SPECS \ - && ln -s ${PLATFORM_DIR}/pkg-src/jellyfin.spec ${SOURCE_DIR}/SPECS/jellyfin.spec - -# Link to RPM sources; mkdir needed or it fails, can't force dest -RUN mkdir -p ${SOURCE_DIR}/SOURCES \ + && dnf install -y dotnet-sdk-${SDK_VERSION} \ + && ln -sf ${PLATFORM_DIR}/docker-build.sh /docker-build.sh \ + && mkdir -p ${SOURCE_DIR}/SPECS \ + && ln -s ${PLATFORM_DIR}/pkg-src/jellyfin.spec ${SOURCE_DIR}/SPECS/jellyfin.spec \ + && mkdir -p ${SOURCE_DIR}/SOURCES \ && ln -s ${PLATFORM_DIR}/pkg-src ${SOURCE_DIR}/SOURCES # Prepare artifact volume |