Skip to content
This repository was archived by the owner on Nov 11, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cdn-server/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

FROM openvisualcloud/xeon-ubuntu1804-media-nginx:20.7
FROM openvisualcloud/xeon-ubuntu1804-media-nginx:21.3

Run DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y -q --no-install-recommends python3-setuptools python3-redis python-celery-common python3-tornado python3-kafka python3-kazoo openssh-server && rm -rf /var/lib/apt/lists/*

Expand Down
2 changes: 1 addition & 1 deletion deployment/kubernetes/yaml/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ HOSTIP=$(ip route get 8.8.8.8 | awk '/ src /{split(substr($0,index($0," src ")),
. "${DIR}/../volume-info.sh"
echo "NVODS=${NVODS} NLIVES=${NLIVES} SCENARIO=${SCENARIO} PLATFORM=${PLATFORM}"
for template in $(find "${DIR}" -maxdepth 1 -name "*.yaml.m4" -print); do
m4 -DNVODS=${NVODS} -DNLIVES=${NLIVES} -DSCENARIO=${SCENARIO} -DPLATFORM=${PLATFORM} -DHOSTIP=${HOSTIP} -DREGISTRY_PREFIX=${REGISTRY} $(env | grep _VOLUME_ | sed 's/^/-D/') -I "${DIR}" "${template}" > "${template/.m4/}"
m4 -DNVODS=${NVODS} -DNLIVES=${NLIVES} -DSCENARIO=${SCENARIO} -DPLATFORM=${PLATFORM} -DUSERID=$(id -u) -DGROUPID=$(id -g) -DHOSTIP=${HOSTIP} -DREGISTRY_PREFIX=${REGISTRY} $(env | grep _VOLUME_ | sed 's/^/-D/') -I "${DIR}" "${template}" > "${template/.m4/}"
done
2 changes: 1 addition & 1 deletion deployment/kubernetes/yaml/live.yaml.m4
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ loopifdef(KIDX,0,``LIVE_'defn(`LIDX')`_'defn(`KIDX')_PROTOCOL',`dnl
"-an",
"-f", "flv", "`rtmp://cdn-service/'defn(`LIVE_'defn(`LIDX')`_'defn(`KIDX')_PROTOCOL)`/media_'defn(`LIDX')`_'defn(`KIDX')",
')dnl
"-abr_pipeline"]
]
volumes:
- name: video-archive
persistentVolumeClaim:
Expand Down
8 changes: 8 additions & 0 deletions deployment/kubernetes/yaml/vod.yaml.m4
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,14 @@ ifelse(defn(`PLATFORM'),`Xeon',,`dnl
name: video-archive
readOnly: true
defn(`PLATFORM_RESOURCES')dnl
initContainers:
- image: busybox:latest
imagePullPolicy: IfNotPresent
name: init
command: ["sh", "-c", "chown -R 1000:1000 /var/www/video"]
volumeMounts:
- mountPath: /var/www/video
name: video-cache
volumes:
- name: video-cache
persistentVolumeClaim:
Expand Down
2 changes: 1 addition & 1 deletion streaming-server/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

FROM openvisualcloud/xeon-ubuntu1804-media-nginx:20.7
FROM openvisualcloud/xeon-ubuntu1804-media-nginx:21.3
COPY *.conf /etc/nginx/
CMD ["/usr/sbin/nginx"]
WORKDIR /home
Expand Down
2 changes: 1 addition & 1 deletion xcode-server/Xeon/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# tc_transcode_xeon

FROM openvisualcloud/xeon-ubuntu1804-media-ffmpeg:20.7
FROM openvisualcloud/xeon-ubuntu1804-media-ffmpeg:21.3
RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y -q --no-install-recommends python3-tornado python3-kafka python3-kazoo python3-psutil && rm -rf /var/lib/apt/lists/*

COPY --from=tc_common /home/ /home/
Expand Down
2 changes: 1 addition & 1 deletion xcode-server/XeonE3/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# tc_transcode_xeone3

FROM openvisualcloud/xeone3-ubuntu1804-media-ffmpeg:20.7
FROM openvisualcloud/xeone3-ubuntu1804-media-ffmpeg:21.3

RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y -q --no-install-recommends python3-tornado python3-kafka python3-kazoo python3-psutil && rm -rf /var/lib/apt/lists/*

Expand Down