docker remove dangling pids (#58)

Co-authored-by: Munaawa Philip <munaawap@kainos.com>

.gitignore

@@ -1,5 +1,6 @@
 media_files/encoded/
 media_files/original/
+media_files/hls/
 postgres_data/
 celerybeat-schedule
 logs/

Dockerfile

@@ -17,8 +17,10 @@ COPY . /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 && \
-    mkdir -p /home/mediacms.io/mediacms/media_files/hls Bento4-SDK-1-6-0-632.x86_64-unknown-linux/bin/ && \
-    unzip -j Bento4-SDK-1-6-0-632.x86_64-unknown-linux.zip Bento4-SDK-1-6-0-632.x86_64-unknown-linux/bin/mp4hls -d Bento4-SDK-1-6-0-632.x86_64-unknown-linux/bin/ && \
+    unzip Bento4-SDK-1-6-0-632.x86_64-unknown-linux.zip -d ../bento4 && \
+    mv ../bento4/Bento4-SDK-1-6-0-632.x86_64-unknown-linux/* ../bento4/ && \
+    rm -rf ../bento4/Bento4-SDK-1-6-0-632.x86_64-unknown-linux && \
+    rm -rf ../bento4/docs && \
     rm Bento4-SDK-1-6-0-632.x86_64-unknown-linux.zip
 
 ############ RUNTIME IMAGE ############

README.md

@@ -4,6 +4,9 @@ MediaCMS is a modern, fully featured open source video and media CMS. It is deve
 
 It is built mostly using the modern stack Django + React and includes a REST API.
 
+A demo is available at https://demo.mediacms.io
+
+
 ## Screenshots
 
 ![MediaCMS](docs/images/index.jpg)
@@ -79,19 +82,27 @@ In terms of disk space, think of what the needs will be. A general rule is to mu
 
 ## Installation
 
-MediaCMS can be installed through an automated script that installs and configures all needed services on a single server, and through Docker Compose.
+There are two ways to run MediaCMS, through Docker Compose and through installing it on a server via an automation script that installs and configures all needed services.
 
 ### Docker Compose installation
-With a recent version of Docker Compose installed, run as root
+Install a recent version of [Docker](https://docs.docker.com/get-docker/), and [Docker Compose](https://docs.docker.com/compose/install/).
 
+Run as root
 
 ```bash
 git clone https://github.com/mediacms-io/mediacms
 cd mediacms
+```
+
+The default option to serve MediaCMS is on http://localhost. If you want to set a url and have it served there, set the `FRONTEND_HOST` variable on file `deploy/docker/local_settings.py`.
+
+Now run
+
+```bash
 docker-compose build && docker-compose up
 ```
 
-This will build an image, download and setup necessary images and start all containers. Once it finishes, MediaCMS will be installed on http://localhost
+This will build an image, download and setup necessary Docker images and start all containers. Once it finishes, MediaCMS will be installed and available on http://localhost (or the url you've set as `FRONTEND_HOST` on file `deploy/docker/local_settings.py`)
 
 For more instructions, checkout the docs on the [Docker deployment](docs/Docker_deployment.md) page. Docker Compose support has been contributed by @swiftugandan.
 

cms/settings.py

@@ -23,7 +23,7 @@ DEFAULT_THEME = "black"  # this is not taken under consideration currently
 # if set to False will not fetch external content
 # this is only for the static files, as fonts/css/js files loaded from CDNs
 # not for user uploaded media!
-LOAD_FROM_CDN = True
+LOAD_FROM_CDN = False
 LOGIN_ALLOWED = True  # whether the login button appears
 REGISTER_ALLOWED = True  # whether the register button appears
 UPLOAD_MEDIA_ALLOWED = True  # whether the upload media button appears

deploy/docker/entrypoint.sh

@@ -6,9 +6,12 @@ ln -sf /dev/stdout /var/log/nginx/access.log && ln -sf /dev/stderr /var/log/ngin
 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
 
-mkdir -p /home/mediacms.io/mediacms/{logs,pids}
+mkdir -p /home/mediacms.io/mediacms/{logs,pids,media_files/hls}
 touch /home/mediacms.io/mediacms/logs/debug.log
 
+# Remove any dangling pids
+rm -rf /home/mediacms.io/mediacms/pids/*
+
 chown -R www-data. /home/mediacms.io/
 
 TARGET_GID=$(stat -c "%g" /home/mediacms.io/mediacms/)

deploy/docker/local_settings.py

@@ -29,4 +29,8 @@ CACHES = {
 BROKER_URL = REDIS_LOCATION
 CELERY_RESULT_BACKEND = BROKER_URL
 
+MP4HLS_COMMAND = (
+    "/home/mediacms.io/bento4/bin/mp4hls"
+)
+
 DEBUG = False

install.sh

@@ -60,8 +60,9 @@ FRONTEND_HOST=`echo "$FRONTEND_HOST" | sed -r 's/https:\/\///g'`
 
 sed -i s/localhost/$FRONTEND_HOST/g deploy/local_install/mediacms.io
 
+FRONTEND_HOST_HTTP_PREFIX='http://'$FRONTEND_HOST
 
-echo 'FRONTEND_HOST='\'"$FRONTEND_HOST"\' >> cms/local_settings.py
+echo 'FRONTEND_HOST='\'"$FRONTEND_HOST_HTTP_PREFIX"\' >> cms/local_settings.py
 echo 'PORTAL_NAME='\'"$PORTAL_NAME"\' >> cms/local_settings.py
 echo "SSL_FRONTEND_HOST = FRONTEND_HOST.replace('http', 'https')" >> cms/local_settings.py
 

static/lib/material-icons/material-icons.css

@@ -1,10 +1,8 @@
-/*@import url('https://fonts.googleapis.com/icon?family=Material+Icons');*/
-
 @font-face {
     font-family: 'Material Icons';
     font-style: normal;
     font-weight: 400;
-    src: url('../../lib/material-icons/v50/icons.woff2') format('woff2');
+    src: url('../../lib/material-icons/v77/icons.woff2') format('woff2');
     font-display: swap;
 }