diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1733e6cea0cdb58383a93eb6970ef53055d718b0..6e89260ba92adabe1cb90bb33d4dd86fec5af834 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,6 @@ image: docker:20.10.9 variables: DOCKER_TLS_CERTDIR: "/certs" - IMAGE_VER: 2.2.3 services: - docker:20.10.9-dind @@ -13,7 +12,8 @@ before_script: build: stage: build script: + - VERSION=`cat VERSION` - docker pull $CI_REGISTRY_IMAGE:latest || true - - docker build --cache-from $CI_REGISTRY_IMAGE:latest --tag $CI_REGISTRY_IMAGE:$IMAGE_VER --tag $CI_REGISTRY_IMAGE:latest . - - docker push $CI_REGISTRY_IMAGE:$IMAGE_VER + - docker build --cache-from $CI_REGISTRY_IMAGE:latest --tag $CI_REGISTRY_IMAGE:$VERSION --tag $CI_REGISTRY_IMAGE:latest . + - docker push $CI_REGISTRY_IMAGE:$VERSION - docker push $CI_REGISTRY_IMAGE:latest diff --git a/VERSION b/VERSION new file mode 100644 index 0000000000000000000000000000000000000000..276cbf9e2858c779297bb9f73b34170302949ec4 --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +2.3.0 diff --git a/package.json b/package.json index cc2733c5a6e83931402aa8a615a87f7e625f5b5b..2003d9769adf154c0c74122c1952414980f4b6e9 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "flv.js": "^1.5.0", "jquery": "^3.5.1", "popper.js": "^1.16.1", - "video.js": "^7.17.1", + "video.js": "^7.18.1", "videojs-contrib-quality-levels": "^2.1.0", "videojs-flvjs": "^0.2.0", "videojs-hls-quality-selector": "^1.1.4" diff --git a/templates/includes/player.html.ep b/templates/includes/player.html.ep index 4a04ff3633b2d257da0ec829d9101d66852251d1..0d6f59fa74a7be5d1f2af9d8cd7dccdfb4a9ef7c 100644 --- a/templates/includes/player.html.ep +++ b/templates/includes/player.html.ep @@ -7,9 +7,13 @@ <script src="/js/videojs-flvjs.min.js"></script> % } +<div id="VideoContainer"> <video id="player" class="video-js vjs-default-skin"> <source src="<%= $src %>" type="<%= $live ? 'application/x-mpegURL':'video/flv' %>" /> </video> +<div class="Info">Počet sledujících: <span id="Watchers">0</span></div> +</div> + <script> @@ -50,3 +54,15 @@ player.ready(function() { </script> +<style> + +.Info { + padding: .2em; + margin-top: 1px; + background-color: #000; + font-size: 80%; + color: #fff; + text-align: right; +} + +</style> diff --git a/templates/stream/player.html.ep b/templates/stream/player.html.ep index 95c1c0fb649433bad695625202655b8d7a3e670f..0bc9dfeaa623a9d83e3ae8d73c7cdcc39851e710 100644 --- a/templates/stream/player.html.ep +++ b/templates/stream/player.html.ep @@ -12,6 +12,7 @@ function connect() { ws.onmessage = function (event) { var data = JSON.parse(event.data) if ( typeof data.watchers !== 'undefined' ) { + $('#Watchers').text(data.watchers); console.log(data); } };