Combine various RUNs in Fedora/CentOS
This commit is contained in:
parent
7be4a8500c
commit
57cefb432a
|
@ -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 \
|
&& 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 \
|
&& rpm -Uvh https://packages.microsoft.com/config/rhel/7/packages-microsoft-prod.rpm \
|
||||||
&& rpmdev-setuptree \
|
&& rpmdev-setuptree \
|
||||||
&& yum install -y dotnet-sdk-${SDK_VERSION}
|
&& yum install -y dotnet-sdk-${SDK_VERSION} \
|
||||||
|
&& ln -sf ${PLATFORM_DIR}/docker-build.sh /docker-build.sh \
|
||||||
# Link to docker-build script
|
&& mkdir -p ${SOURCE_DIR}/SPECS \
|
||||||
RUN ln -sf ${PLATFORM_DIR}/docker-build.sh /docker-build.sh
|
&& ln -s ${PLATFORM_DIR}/pkg-src/jellyfin.spec ${SOURCE_DIR}/SPECS/jellyfin.spec \
|
||||||
|
&& mkdir -p ${SOURCE_DIR}/SOURCES \
|
||||||
# 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 \
|
|
||||||
&& ln -s ${PLATFORM_DIR}/pkg-src ${SOURCE_DIR}/SOURCES
|
&& ln -s ${PLATFORM_DIR}/pkg-src ${SOURCE_DIR}/SOURCES
|
||||||
|
|
||||||
# Prepare artifact volume
|
# Prepare artifact volume
|
||||||
|
|
|
@ -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 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 \
|
&& dnf copr enable -y @dotnet-sig/dotnet \
|
||||||
&& rpmdev-setuptree \
|
&& rpmdev-setuptree \
|
||||||
&& dnf install -y dotnet-sdk-${SDK_VERSION}
|
&& dnf install -y dotnet-sdk-${SDK_VERSION} \
|
||||||
|
&& ln -sf ${PLATFORM_DIR}/docker-build.sh /docker-build.sh \
|
||||||
# Link to docker-build script
|
&& mkdir -p ${SOURCE_DIR}/SPECS \
|
||||||
RUN ln -sf ${PLATFORM_DIR}/docker-build.sh /docker-build.sh
|
&& ln -s ${PLATFORM_DIR}/pkg-src/jellyfin.spec ${SOURCE_DIR}/SPECS/jellyfin.spec \
|
||||||
|
&& mkdir -p ${SOURCE_DIR}/SOURCES \
|
||||||
# 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 \
|
|
||||||
&& ln -s ${PLATFORM_DIR}/pkg-src ${SOURCE_DIR}/SOURCES
|
&& ln -s ${PLATFORM_DIR}/pkg-src ${SOURCE_DIR}/SOURCES
|
||||||
|
|
||||||
# Prepare artifact volume
|
# Prepare artifact volume
|
||||||
|
|
Loading…
Reference in New Issue
Block a user