hoelee/tubesync
1
0
Fork 0
mirror of https://github.com/meeb/tubesync.git synced 2025-06-25 14:36:34 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #562 from tcely/patch-3
Some checks failed
Run Django tests for TubeSync / test (3.7) (push) Has been cancelled
Details
Run Django tests for TubeSync / test (3.8) (push) Has been cancelled
Details
Run Django tests for TubeSync / test (3.9) (push) Has been cancelled
Details
Run Django tests for TubeSync / containerise (push) Has been cancelled
Details

Browse Source 
Refinements for Dockerfile
This commit is contained in:
meeb 2024-11-27 02:15:35 +11:00 committed by GitHub
commit 40e48c9317
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Dockerfile
View File

@ -29,8 +29,8 @@ ENV DEBIAN_FRONTEND="noninteractive" \
# Reminder: the SHELL handles all variables # Reminder: the SHELL handles all variables
RUN decide_arch() { \ RUN decide_arch() { \
case "${TARGETARCH:=amd64}" in \ case "${TARGETARCH:=amd64}" in \
(arm64) printf 'aarch64' ;; \ (arm64) printf -- 'aarch64' ;; \
(*) printf '%s' "${TARGETARCH}" ;; \ (*) printf -- '%s' "${TARGETARCH}" ;; \
esac ; \ esac ; \
} && \ } && \
decide_expected() { \ decide_expected() { \
@ -81,17 +81,18 @@ RUN decide_arch() { \
url="$(decide_url "${1}" "${2}")" ; \ url="$(decide_url "${1}" "${2}")" ; \
printf -- '%s\n' \ printf -- '%s\n' \
"Building for arch: ${2}|${ARCH}, downloading ${arg1} from: ${url}, expecting ${arg1} SHA256: ${expected}" && \ "Building for arch: ${2}|${ARCH}, downloading ${arg1} from: ${url}, expecting ${arg1} SHA256: ${expected}" && \
curl -sSL --output "${file}" "${url}" && \ rm -rf "${file}" && \
curl --disable --output "${file}" --clobber --location --no-progress-meter --url "${url}" && \
verify_download "${expected}" "${file}" ; \ verify_download "${expected}" "${file}" ; \
} && \ } && \
export ARCH="$(decide_arch)" && \ export ARCH="$(decide_arch)" && \
set -x && \ set -x && \
apt-get update && \ apt-get update && \
apt-get -y --no-install-recommends install locales && \ apt-get -y --no-install-recommends install locales && \
echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && \ printf -- "en_US.UTF-8 UTF-8\n" > /etc/locale.gen && \
locale-gen en_US.UTF-8 && \ locale-gen en_US.UTF-8 && \
# Install required distro packages # Install required distro packages
apt-get -y --no-install-recommends install curl ca-certificates binutils xz-utils && \ apt-get -y --no-install-recommends install curl ca-certificates file binutils xz-utils && \
# Install s6 # Install s6
_file="/tmp/s6-overlay-noarch.tar.xz" && \ _file="/tmp/s6-overlay-noarch.tar.xz" && \
download_expected_file s6 noarch "${_file}" && \ download_expected_file s6 noarch "${_file}" && \
@ -99,12 +100,14 @@ RUN decide_arch() { \
_file="/tmp/s6-overlay-${ARCH}.tar.xz" && \ _file="/tmp/s6-overlay-${ARCH}.tar.xz" && \
download_expected_file s6 "${TARGETARCH}" "${_file}" && \ download_expected_file s6 "${TARGETARCH}" "${_file}" && \
tar -C / -xpf "${_file}" && rm -f "${_file}" && \ tar -C / -xpf "${_file}" && rm -f "${_file}" && \
file -L /command/s6-overlay-suexec && \
# Install ffmpeg # Install ffmpeg
_file="/tmp/ffmpeg-${ARCH}.tar.xz" && \ _file="/tmp/ffmpeg-${ARCH}.tar.xz" && \
download_expected_file ffmpeg "${TARGETARCH}" "${_file}" && \ download_expected_file ffmpeg "${TARGETARCH}" "${_file}" && \
tar -xvvpf "${_file}" --strip-components=2 --no-anchored -C /usr/local/bin/ "ffmpeg" "ffprobe" && rm -f "${_file}" && \ tar -xvvpf "${_file}" --strip-components=2 --no-anchored -C /usr/local/bin/ "ffmpeg" "ffprobe" && rm -f "${_file}" && \
file /usr/local/bin/ff* && \
# Clean up # Clean up
apt-get -y autoremove --purge curl binutils xz-utils && \ apt-get -y autoremove --purge curl file binutils xz-utils && \
rm -rf /var/lib/apt/lists/* && \ rm -rf /var/lib/apt/lists/* && \
rm -rf /var/cache/apt/* && \ rm -rf /var/cache/apt/* && \
rm -rf /tmp/* rm -rf /tmp/*
@ -159,8 +162,8 @@ RUN set -x && \
groupadd app && \ groupadd app && \
useradd -M -d /app -s /bin/false -g app app && \ useradd -M -d /app -s /bin/false -g app app && \
# Install non-distro packages # Install non-distro packages
cp -at /tmp/ "${HOME}" && HOME="/tmp/${HOME#/}" && \ cp -at /tmp/ "${HOME}" && \
PIPENV_VERBOSITY=64 pipenv install --system --skip-lock && \ PIPENV_VERBOSITY=64 HOME="/tmp/${HOME#/}" pipenv install --system --skip-lock && \
# Clean up # Clean up
rm /app/Pipfile && \ rm /app/Pipfile && \
pipenv --clear && \ pipenv --clear && \
@ -196,16 +199,18 @@ RUN set -x && \
/usr/bin/python3 /app/manage.py compilescss && \ /usr/bin/python3 /app/manage.py compilescss && \
/usr/bin/python3 /app/manage.py collectstatic --no-input --link && \ /usr/bin/python3 /app/manage.py collectstatic --no-input --link && \
# Create config, downloads and run dirs # Create config, downloads and run dirs
mkdir -p /run/app && \ mkdir -v -p /run/app && \
mkdir -p /config/media && \ mkdir -v -p /config/media && \
mkdir -p /downloads/audio && \ mkdir -v -p /downloads/audio && \
mkdir -p /downloads/video mkdir -v -p /downloads/video
# Append software versions # Append software versions
RUN set -x && \ RUN set -x && \
FFMPEG_VERSION=$(/usr/local/bin/ffmpeg -version | head -n 1 | awk '{ print $3 }') && \ /usr/local/bin/ffmpeg -version && \
echo "ffmpeg_version = '${FFMPEG_VERSION}'" >> /app/common/third_party_versions.py FFMPEG_VERSION=$(/usr/local/bin/ffmpeg -version | awk -v 'ev=31' '1 == NR && "ffmpeg" == $1 { print $3; ev=0; } END { exit ev; }') && \
test -n "${FFMPEG_VERSION}" && \
printf -- "ffmpeg_version = '%s'\n" "${FFMPEG_VERSION}" >> /app/common/third_party_versions.py
# Copy root # Copy root
COPY config/root / COPY config/root /