Clean up web_build_dir in docker-build.sh

This commit is contained in:
Joshua Boniface 2019-09-25 01:36:20 -04:00
parent 172a81b22c
commit 4b257b7b4a
13 changed files with 15 additions and 1 deletions

View File

@ -21,6 +21,7 @@ yarn build
mkdir -p ${web_target} mkdir -p ${web_target}
mv dist/* ${web_target}/ mv dist/* ${web_target}/
popd popd
rm -rf ${web_build_dir}
# Build RPM # Build RPM
spectool -g -R SPECS/jellyfin.spec spectool -g -R SPECS/jellyfin.spec

View File

@ -24,6 +24,7 @@ yarn build
mkdir -p ${web_target} mkdir -p ${web_target}
mv dist/* ${web_target}/ mv dist/* ${web_target}/
popd popd
rm -rf ${web_build_dir}
# Build DEB # Build DEB
export CONFIG_SITE=/etc/dpkg-cross/cross-config.${ARCH} export CONFIG_SITE=/etc/dpkg-cross/cross-config.${ARCH}

View File

@ -11,7 +11,6 @@ pushd ${SOURCE_DIR}
# Remove build-dep for dotnet-sdk-2.2, since it's not a package in this image # Remove build-dep for dotnet-sdk-2.2, since it's not a package in this image
sed -i '/dotnet-sdk-2.2,/d' debian/control sed -i '/dotnet-sdk-2.2,/d' debian/control
# Clone down and build Web frontend # Clone down and build Web frontend
web_build_dir="$( mktemp -d )" web_build_dir="$( mktemp -d )"
web_target="${SOURCE_DIR}/MediaBrowser.WebDashboard/jellyfin-web" web_target="${SOURCE_DIR}/MediaBrowser.WebDashboard/jellyfin-web"
@ -25,6 +24,7 @@ yarn build
mkdir -p ${web_target} mkdir -p ${web_target}
mv dist/* ${web_target}/ mv dist/* ${web_target}/
popd popd
rm -rf ${web_build_dir}
# Build DEB # Build DEB
export CONFIG_SITE=/etc/dpkg-cross/cross-config.${ARCH} export CONFIG_SITE=/etc/dpkg-cross/cross-config.${ARCH}

View File

@ -24,6 +24,7 @@ yarn build
mkdir -p ${web_target} mkdir -p ${web_target}
mv dist/* ${web_target}/ mv dist/* ${web_target}/
popd popd
rm -rf ${web_build_dir}
# Build DEB # Build DEB
dpkg-buildpackage -us -uc dpkg-buildpackage -us -uc

View File

@ -21,6 +21,7 @@ yarn build
mkdir -p ${web_target} mkdir -p ${web_target}
mv dist/* ${web_target}/ mv dist/* ${web_target}/
popd popd
rm -rf ${web_build_dir}
# Build RPM # Build RPM
spectool -g -R SPECS/jellyfin.spec spectool -g -R SPECS/jellyfin.spec

View File

@ -21,6 +21,7 @@ yarn build
mkdir -p ${web_target} mkdir -p ${web_target}
mv dist/* ${web_target}/ mv dist/* ${web_target}/
popd popd
rm -rf ${web_build_dir}
# Get version # Get version
version="$( grep "version:" ./build.yaml | sed -E 's/version: "([0-9\.]+.*)"/\1/' )" version="$( grep "version:" ./build.yaml | sed -E 's/version: "([0-9\.]+.*)"/\1/' )"

View File

@ -21,6 +21,7 @@ yarn build
mkdir -p ${web_target} mkdir -p ${web_target}
mv dist/* ${web_target}/ mv dist/* ${web_target}/
popd popd
rm -rf ${web_build_dir}
# Get version # Get version
version="$( grep "version:" ./build.yaml | sed -E 's/version: "([0-9\.]+.*)"/\1/' )" version="$( grep "version:" ./build.yaml | sed -E 's/version: "([0-9\.]+.*)"/\1/' )"

View File

@ -21,6 +21,7 @@ yarn build
mkdir -p ${web_target} mkdir -p ${web_target}
mv dist/* ${web_target}/ mv dist/* ${web_target}/
popd popd
rm -rf ${web_build_dir}
# Get version # Get version
version="$( grep "version:" ./build.yaml | sed -E 's/version: "([0-9\.]+.*)"/\1/' )" version="$( grep "version:" ./build.yaml | sed -E 's/version: "([0-9\.]+.*)"/\1/' )"

View File

@ -24,6 +24,7 @@ yarn build
mkdir -p ${web_target} mkdir -p ${web_target}
mv dist/* ${web_target}/ mv dist/* ${web_target}/
popd popd
rm -rf ${web_build_dir}
# Build DEB # Build DEB
export CONFIG_SITE=/etc/dpkg-cross/cross-config.${ARCH} export CONFIG_SITE=/etc/dpkg-cross/cross-config.${ARCH}

View File

@ -24,6 +24,7 @@ yarn build
mkdir -p ${web_target} mkdir -p ${web_target}
mv dist/* ${web_target}/ mv dist/* ${web_target}/
popd popd
rm -rf ${web_build_dir}
# Build DEB # Build DEB
export CONFIG_SITE=/etc/dpkg-cross/cross-config.${ARCH} export CONFIG_SITE=/etc/dpkg-cross/cross-config.${ARCH}

View File

@ -24,6 +24,7 @@ yarn build
mkdir -p ${web_target} mkdir -p ${web_target}
mv dist/* ${web_target}/ mv dist/* ${web_target}/
popd popd
rm -rf ${web_build_dir}
# Build DEB # Build DEB
dpkg-buildpackage -us -uc dpkg-buildpackage -us -uc

View File

@ -27,6 +27,7 @@ yarn build
mkdir -p ${web_target} mkdir -p ${web_target}
mv dist/* ${web_target}/ mv dist/* ${web_target}/
popd popd
rm -rf ${web_build_dir}
# Get version # Get version
version="$( grep "version:" ./build.yaml | sed -E 's/version: "([0-9\.]+.*)"/\1/' )" version="$( grep "version:" ./build.yaml | sed -E 's/version: "([0-9\.]+.*)"/\1/' )"
@ -43,6 +44,7 @@ cp ${addin_build_dir}/${NSSM_VERSION}/win64/nssm.exe /dist/jellyfin_${version}/n
unzip ${addin_build_dir}/ffmpeg.zip -d ${addin_build_dir} unzip ${addin_build_dir}/ffmpeg.zip -d ${addin_build_dir}
cp ${addin_build_dir}/${FFMPEG_VERSION}/bin/ffmpeg.exe /dist/jellyfin_${version}/ffmpeg.exe cp ${addin_build_dir}/${FFMPEG_VERSION}/bin/ffmpeg.exe /dist/jellyfin_${version}/ffmpeg.exe
cp ${addin_build_dir}/${FFMPEG_VERSION}/bin/ffprobe.exe /dist/jellyfin_${version}/ffprobe.exe cp ${addin_build_dir}/${FFMPEG_VERSION}/bin/ffprobe.exe /dist/jellyfin_${version}/ffprobe.exe
rm -rf ${addin_build_dir}
# Prepare scripts # Prepare scripts
cp ${SOURCE_DIR}/deployment/windows/legacy/install-jellyfin.ps1 /dist/jellyfin_${version}/install-jellyfin.ps1 cp ${SOURCE_DIR}/deployment/windows/legacy/install-jellyfin.ps1 /dist/jellyfin_${version}/install-jellyfin.ps1

View File

@ -27,6 +27,7 @@ yarn build
mkdir -p ${web_target} mkdir -p ${web_target}
mv dist/* ${web_target}/ mv dist/* ${web_target}/
popd popd
rm -rf ${web_build_dir}
# Get version # Get version
version="$( grep "version:" ./build.yaml | sed -E 's/version: "([0-9\.]+.*)"/\1/' )" version="$( grep "version:" ./build.yaml | sed -E 's/version: "([0-9\.]+.*)"/\1/' )"
@ -43,6 +44,7 @@ cp ${addin_build_dir}/${NSSM_VERSION}/win64/nssm.exe /dist/jellyfin_${version}/n
unzip ${addin_build_dir}/ffmpeg.zip -d ${addin_build_dir} unzip ${addin_build_dir}/ffmpeg.zip -d ${addin_build_dir}
cp ${addin_build_dir}/${FFMPEG_VERSION}/bin/ffmpeg.exe /dist/jellyfin_${version}/ffmpeg.exe cp ${addin_build_dir}/${FFMPEG_VERSION}/bin/ffmpeg.exe /dist/jellyfin_${version}/ffmpeg.exe
cp ${addin_build_dir}/${FFMPEG_VERSION}/bin/ffprobe.exe /dist/jellyfin_${version}/ffprobe.exe cp ${addin_build_dir}/${FFMPEG_VERSION}/bin/ffprobe.exe /dist/jellyfin_${version}/ffprobe.exe
rm -rf ${addin_build_dir}
# Prepare scripts # Prepare scripts
cp ${SOURCE_DIR}/deployment/windows/legacy/install-jellyfin.ps1 /dist/jellyfin_${version}/install-jellyfin.ps1 cp ${SOURCE_DIR}/deployment/windows/legacy/install-jellyfin.ps1 /dist/jellyfin_${version}/install-jellyfin.ps1