extern/mediacms
1
0
Fork 0
mirror of https://github.com/mediacms-io/mediacms.git synced 2025-02-16 10:29:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix docker chown recursion performance and bento4 upgrade (#95)

Browse Source 
* optimize docker chown performance

* upgrades bento4
This commit is contained in:
swiftugandan 2021-03-22 18:04:12 +00:00 committed by GitHub
parent 2b65afc8dd
commit 0129ab6732
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,6 +1,8 @@
media_files/encoded/ media_files/encoded/
media_files/original/ media_files/original/
media_files/hls/ media_files/hls/
media_files/chunks/
media_files/uploads/
postgres_data/ postgres_data/
celerybeat-schedule celerybeat-schedule
logs/ logs/

12
Dockerfile
View File

@ -16,12 +16,12 @@ RUN pip install -r requirements.txt
COPY . /home/mediacms.io/mediacms COPY . /home/mediacms.io/mediacms
WORKDIR /home/mediacms.io/mediacms WORKDIR /home/mediacms.io/mediacms
RUN wget -q http://zebulon.bok.net/Bento4/binaries/Bento4-SDK-1-6-0-632.x86_64-unknown-linux.zip && \ RUN wget -q http://zebulon.bok.net/Bento4/binaries/Bento4-SDK-1-6-0-637.x86_64-unknown-linux.zip && \
unzip Bento4-SDK-1-6-0-632.x86_64-unknown-linux.zip -d ../bento4 && \ unzip Bento4-SDK-1-6-0-637.x86_64-unknown-linux.zip -d ../bento4 && \
mv ../bento4/Bento4-SDK-1-6-0-632.x86_64-unknown-linux/* ../bento4/ && \ mv ../bento4/Bento4-SDK-1-6-0-637.x86_64-unknown-linux/* ../bento4/ && \
rm -rf ../bento4/Bento4-SDK-1-6-0-632.x86_64-unknown-linux && \ rm -rf ../bento4/Bento4-SDK-1-6-0-637.x86_64-unknown-linux && \
rm -rf ../bento4/docs && \ rm -rf ../bento4/docs && \
rm Bento4-SDK-1-6-0-632.x86_64-unknown-linux.zip rm Bento4-SDK-1-6-0-637.x86_64-unknown-linux.zip
############ RUNTIME IMAGE ############ ############ RUNTIME IMAGE ############
FROM python:3.8-slim-buster as runtime-image FROM python:3.8-slim-buster as runtime-image
@ -47,7 +47,7 @@ ENV ENABLE_MIGRATIONS='yes'
ENV VIRTUAL_ENV=/home/mediacms.io ENV VIRTUAL_ENV=/home/mediacms.io
ENV PATH="$VIRTUAL_ENV/bin:$PATH" ENV PATH="$VIRTUAL_ENV/bin:$PATH"
COPY --from=compile-image /home/mediacms.io /home/mediacms.io COPY --chown=www-data:www-data --from=compile-image /home/mediacms.io /home/mediacms.io
RUN apt-get update -y && apt-get -y upgrade && apt-get install --no-install-recommends \ RUN apt-get update -y && apt-get -y upgrade && apt-get install --no-install-recommends \
supervisor nginx ffmpeg imagemagick procps -y && \ supervisor nginx ffmpeg imagemagick procps -y && \

6
deploy/docker/entrypoint.sh
View File

@ -4,6 +4,7 @@ set -e
# forward request and error logs to docker log collector # forward request and error logs to docker log collector
ln -sf /dev/stdout /var/log/nginx/access.log && ln -sf /dev/stderr /var/log/nginx/error.log && \ ln -sf /dev/stdout /var/log/nginx/access.log && ln -sf /dev/stderr /var/log/nginx/error.log && \
ln -sf /dev/stdout /var/log/nginx/mediacms.io.access.log && ln -sf /dev/stderr /var/log/nginx/mediacms.io.error.log ln -sf /dev/stdout /var/log/nginx/mediacms.io.access.log && ln -sf /dev/stderr /var/log/nginx/mediacms.io.error.log
cp /home/mediacms.io/mediacms/deploy/docker/local_settings.py /home/mediacms.io/mediacms/cms/local_settings.py cp /home/mediacms.io/mediacms/deploy/docker/local_settings.py /home/mediacms.io/mediacms/cms/local_settings.py
mkdir -p /home/mediacms.io/mediacms/{logs,pids,media_files/hls} mkdir -p /home/mediacms.io/mediacms/{logs,pids,media_files/hls}
@ -12,8 +13,6 @@ touch /home/mediacms.io/mediacms/logs/debug.log
# Remove any dangling pids # Remove any dangling pids
rm -rf /home/mediacms.io/mediacms/pids/* rm -rf /home/mediacms.io/mediacms/pids/*
chown -R www-data. /home/mediacms.io/
TARGET_GID=$(stat -c "%g" /home/mediacms.io/mediacms/) TARGET_GID=$(stat -c "%g" /home/mediacms.io/mediacms/)
EXISTS=$(cat /etc/group | grep $TARGET_GID | wc -l) EXISTS=$(cat /etc/group | grep $TARGET_GID | wc -l)
@ -28,6 +27,9 @@ else
usermod -a -G $GROUP www-data usermod -a -G $GROUP www-data
fi fi
# We should do this only for folders that have a different owner, since it is an expensive operation
find /home/mediacms.io/ ! \( -user www-data -group $TARGET_GID \) -exec chown www-data:$TARGET_GID {} +
chmod +x /home/mediacms.io/mediacms/deploy/docker/start.sh /home/mediacms.io/mediacms/deploy/docker/prestart.sh chmod +x /home/mediacms.io/mediacms/deploy/docker/start.sh /home/mediacms.io/mediacms/deploy/docker/prestart.sh
exec "$@" exec "$@"

4
install.sh
View File

@ -115,8 +115,8 @@ fi
# Bento4 utility installation, for HLS # Bento4 utility installation, for HLS
cd /home/mediacms.io/mediacms cd /home/mediacms.io/mediacms
wget http://zebulon.bok.net/Bento4/binaries/Bento4-SDK-1-6-0-632.x86_64-unknown-linux.zip wget http://zebulon.bok.net/Bento4/binaries/Bento4-SDK-1-6-0-637.x86_64-unknown-linux.zip
unzip Bento4-SDK-1-6-0-632.x86_64-unknown-linux.zip unzip Bento4-SDK-1-6-0-637.x86_64-unknown-linux.zip
mkdir /home/mediacms.io/mediacms/media_files/hls mkdir /home/mediacms.io/mediacms/media_files/hls
# last, set default owner # last, set default owner