Rename 'stream-playout' to 'stream-player'
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
This commit is contained in:
parent
821d3d4407
commit
7d0eab3659
|
|
@ -23,9 +23,9 @@ steps:
|
|||
image: plugins/docker
|
||||
settings:
|
||||
registry: registry.luj0ga.de
|
||||
repo: registry.luj0ga.de/stream-playout
|
||||
dockerfile: stream-playout/Dockerfile
|
||||
context: stream-playout
|
||||
repo: registry.luj0ga.de/stream-player
|
||||
dockerfile: stream-player/Dockerfile
|
||||
context: stream-player
|
||||
tags:
|
||||
- stable-alpine
|
||||
username:
|
||||
|
|
|
|||
10
Makefile
10
Makefile
|
|
@ -1,13 +1,13 @@
|
|||
.PHONY: all clean nginx-rtmp stream-playout
|
||||
.PHONY: all clean nginx-rtmp stream-player
|
||||
|
||||
all: nginx-rtmp stream-playout
|
||||
all: nginx-rtmp stream-player
|
||||
|
||||
clean:
|
||||
$(MAKE) -C nginx-rtmp clean
|
||||
$(MAKE) -C stream-playout clean
|
||||
$(MAKE) -C stream-player clean
|
||||
|
||||
nginx-rtmp:
|
||||
$(MAKE) -C nginx-rtmp
|
||||
|
||||
stream-playout:
|
||||
$(MAKE) -C stream-playout
|
||||
stream-player:
|
||||
$(MAKE) -C stream-player
|
||||
|
|
|
|||
|
|
@ -8,9 +8,9 @@ Alpine 3.12-based docker image containing NGINX with RTMP module
|
|||
|
||||
* alpine3.12
|
||||
|
||||
## stream-playout
|
||||
## stream-player
|
||||
|
||||
NGINX docker image with built-in playout website based on [video.js](https://videojs.com)
|
||||
NGINX docker image with built-in player website based on [video.js](https://videojs.com)
|
||||
|
||||
### Tags
|
||||
|
||||
|
|
|
|||
|
|
@ -25,9 +25,9 @@ services:
|
|||
- /srv/streaming/edge/streams:/etc/nginx/streams.d:ro
|
||||
- /srv/streaming/edge/conf:/etc/nginx/conf.d:ro
|
||||
|
||||
# Playout website
|
||||
playout:
|
||||
image: stream-playout:stable-alpine
|
||||
# Player website
|
||||
player:
|
||||
image: stream-player:stable-alpine
|
||||
restart: always
|
||||
|
||||
# NGINX proxy
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ server {
|
|||
listen 80;
|
||||
|
||||
location / {
|
||||
proxy_pass http://playout:80;
|
||||
proxy_pass http://player:80;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
DOCKER = docker
|
||||
|
||||
image = stream-playout
|
||||
image = stream-player
|
||||
tag = stable-alpine
|
||||
|
||||
.PHONY: all clean $(image)
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Stream playout</title>
|
||||
<title>Stream player</title>
|
||||
<link rel="icon" href="data:;base64,iVBORw0KGgo=">
|
||||
<link rel="stylesheet" href="main.css">
|
||||
</head>
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"name": "stream-playout",
|
||||
"name": "stream-player",
|
||||
"version": "1.0.0",
|
||||
"lockfileVersion": 1,
|
||||
"requires": true,
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "stream-playout",
|
||||
"name": "stream-player",
|
||||
"version": "1.0.0",
|
||||
"description": "Playout website for live streams",
|
||||
"description": "Player website for live streams",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"test": "echo \"Error: no test specified\" && exit 1",
|
||||
Loading…
Reference in New Issue