Skip to content

Docker entrypoint.sh fix to copying from osp-rtmp

Kenneth Larson requested to merge TethySpruce/flask-nginx-rtmp-manager:docker-entrypoint-fix into nightly

Merge Request Guidelines

  1. Please fill this form out to the best of your ability.
  2. Follow the principle of "One Merge Request, One Concern"
  3. Merge Requests must be complete in total.
  4. Contributed Code must be universal in scope, ie: Able to be used for all installs / install environments.

Description

In the "placing configuration files" step of the docker setup, a few lines in entrypoint.sh are changed. The lines were copying files from /opt/osp-rtmp/osp-rtmp/setup/.... They now copy from /opt/osp-rtmp/setup/....

echo 'Placing Configuration Files'
...

# BEFORE
cp -u -p /opt/osp-rtmp/osp-rtmp/setup/nginx/services/* /usr/local/nginx/conf/services
cp -u -p /opt/osp-rtmp/osp-rtmp/setup/nginx/custom/osp-rtmp-custom-ome.conf /usr/local/nginx/conf/custom

# AFTER
cp -u -p /opt/osp-rtmp/setup/nginx/services/* /usr/local/nginx/conf/services
cp -u -p /opt/osp-rtmp/setup/nginx/custom/osp-rtmp-custom-ome.conf /usr/local/nginx/conf/custom

Motivation and Context

This solves a problem where setting up a docker instance of osp-rtmp can fail because of failing to copy files to the appropriate places.

How Has This Been Tested?

Wasn't explicitly tested, but the change itself is small and simple.

Screenshots (if appropriate):

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • My code follows the code style of this project.
  • Merge Request Follows the Merge Request Guidelines
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.

Merge request reports