diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2022-05-15 23:42:40 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2022-05-15 23:42:40 +0200 |
| commit | 85617c9e9ecf1e390923c022d9f05840bc415338 (patch) | |
| tree | 53eb40d006bd56e463dcf2237fc9c431b8e79143 /roles/streaming | |
| parent | system_lvm: make default volume sizes overideable (diff) | |
remove ch-helene frm k8s cluster chtest for now and migrate to new streaming containers
Diffstat (limited to 'roles/streaming')
| -rw-r--r-- | roles/streaming/rtmp/streamer/defaults/main.yml | 3 | ||||
| -rw-r--r-- | roles/streaming/rtmp/streamer/templates/pod-spec.yml.j2 | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/roles/streaming/rtmp/streamer/defaults/main.yml b/roles/streaming/rtmp/streamer/defaults/main.yml index 6d66683a..d4222f8b 100644 --- a/roles/streaming/rtmp/streamer/defaults/main.yml +++ b/roles/streaming/rtmp/streamer/defaults/main.yml @@ -6,7 +6,8 @@ rtmp_streamer_base_path: /srv/rtmp/streamer rtmp_streamer_port: 1935 # rtmp_streamer_inst_name: feed -# rtmp_streamer_nginx_image_version: 2021-02-24.20 +# rtmp_streamer_nginx_image_version: 2022-05-15.24 +# rtmp_streamer_ffmpeg_image_version: bullseye-decklink11.7-2022-05-15.13 # rtmp_streamer_decklink_card: "DeckLink Mini Recorder" rtmp_streamer_app_name: "{{ rtmp_streamer_inst_name }}" rtmp_streamer_quality_levels: diff --git a/roles/streaming/rtmp/streamer/templates/pod-spec.yml.j2 b/roles/streaming/rtmp/streamer/templates/pod-spec.yml.j2 index 329267bc..5f97d9b8 100644 --- a/roles/streaming/rtmp/streamer/templates/pod-spec.yml.j2 +++ b/roles/streaming/rtmp/streamer/templates/pod-spec.yml.j2 @@ -20,7 +20,7 @@ containers: mountPath: /var/lib/nginx - name: source - image: registry.gitlab.com/spreadspace/docker/nginx:{{ rtmp_streamer_nginx_image_version }} + image: registry.gitlab.com/spreadspace/docker/ffmpeg:{{ rtmp_streamer_ffmpeg_image_version }} imagePullPolicy: Always command: - ffmpeg-decklink-rtmp.py @@ -55,7 +55,7 @@ containers: {% for name, forward in rtmp_streamer_forwards.items() %} - name: "forward-{{ name }}" - image: registry.gitlab.com/spreadspace/docker/nginx:{{ rtmp_streamer_nginx_image_version }} + image: registry.gitlab.com/spreadspace/docker/ffmpeg:{{ rtmp_streamer_ffmpeg_image_version }} imagePullPolicy: Always command: - /usr/bin/ffmpeg @@ -77,7 +77,7 @@ containers: {% endfor %} {% if rtmp_streamer_recording is defined %} - name: record - image: registry.gitlab.com/spreadspace/docker/nginx:{{ rtmp_streamer_nginx_image_version }} + image: registry.gitlab.com/spreadspace/docker/ffmpeg:{{ rtmp_streamer_ffmpeg_image_version }} imagePullPolicy: Always command: - /usr/bin/ffmpeg |