diff --git a/.drone.yml b/.drone.yml index a9acfe6..d94dee0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -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: diff --git a/Makefile b/Makefile index c61e02f..a5894ce 100644 --- a/Makefile +++ b/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 diff --git a/README.md b/README.md index 259e34d..de84f47 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/docker-compose.yml b/docker-compose.yml index 5017850..afdd154 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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 diff --git a/srv/streaming/proxy.conf b/srv/streaming/proxy.conf index c3a6052..2ad4543 100644 --- a/srv/streaming/proxy.conf +++ b/srv/streaming/proxy.conf @@ -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; } diff --git a/stream-playout/.gitignore b/stream-player/.gitignore similarity index 100% rename from stream-playout/.gitignore rename to stream-player/.gitignore diff --git a/stream-playout/Dockerfile b/stream-player/Dockerfile similarity index 100% rename from stream-playout/Dockerfile rename to stream-player/Dockerfile diff --git a/stream-playout/Makefile b/stream-player/Makefile similarity index 89% rename from stream-playout/Makefile rename to stream-player/Makefile index f1cbe7b..711ee6b 100644 --- a/stream-playout/Makefile +++ b/stream-player/Makefile @@ -1,6 +1,6 @@ DOCKER = docker -image = stream-playout +image = stream-player tag = stable-alpine .PHONY: all clean $(image) diff --git a/stream-playout/index.html b/stream-player/index.html similarity index 92% rename from stream-playout/index.html rename to stream-player/index.html index acef91e..1a18a84 100644 --- a/stream-playout/index.html +++ b/stream-player/index.html @@ -2,7 +2,7 @@ - Stream playout + Stream player diff --git a/stream-playout/package-lock.json b/stream-player/package-lock.json similarity index 99% rename from stream-playout/package-lock.json rename to stream-player/package-lock.json index cd48dbb..7f413b0 100644 --- a/stream-playout/package-lock.json +++ b/stream-player/package-lock.json @@ -1,5 +1,5 @@ { - "name": "stream-playout", + "name": "stream-player", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/stream-playout/package.json b/stream-player/package.json similarity index 84% rename from stream-playout/package.json rename to stream-player/package.json index 539b8f6..e756cc7 100644 --- a/stream-playout/package.json +++ b/stream-player/package.json @@ -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", diff --git a/stream-playout/src/index.js b/stream-player/src/index.js similarity index 100% rename from stream-playout/src/index.js rename to stream-player/src/index.js diff --git a/stream-playout/src/style.css b/stream-player/src/style.css similarity index 100% rename from stream-playout/src/style.css rename to stream-player/src/style.css diff --git a/stream-playout/webpack.config.js b/stream-player/webpack.config.js similarity index 100% rename from stream-playout/webpack.config.js rename to stream-player/webpack.config.js