Skip to content

Commit

Permalink
updated package versions
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelkamprath committed Mar 14, 2022
1 parent 031bfe3 commit bb76d59
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 5 deletions.
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -127,3 +127,8 @@ dmypy.json

# Pyre type checker
.pyre/


# MacOS
.DS_Store

2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
All notable changes to this project will be documented in this file.

## [Unreleased]
* Bummped various package versions.
* Added python `requirements.txt` file for UpCloud deployment script.

## [0.4.2]
### Added
Expand Down
1 change: 0 additions & 1 deletion deployment-scripts/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
# ignore python environments set up for development
upcloud/
linode/
2 changes: 2 additions & 0 deletions deployment-scripts/upcloud/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# virtual environment
.venv
1 change: 1 addition & 0 deletions deployment-scripts/upcloud/requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
upcloud_api
File renamed without changes.
9 changes: 5 additions & 4 deletions multistreaming-server/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
FROM jrottenberg/ffmpeg:4.4-alpine
FROM jrottenberg/ffmpeg:5-alpine
MAINTAINER Michael Kamprath "https://github.com/michaelkamprath"

ARG NGINX_VERSION=1.20.0
ARG RTMP_REPO=uizaio
ARG RTMP_MODULE_VERSION=1.4.0.4
ARG TINI_VERSION=v0.19.0
ARG SUPERVISORD_VERSION=4.2.2
ARG PIPENV_PACKAGE_VERSION=2020.11.15
ARG SUPERVISORD_VERSION=4.2.4
ARG PIPENV_PACKAGE_VERSION=2022.1.8

RUN set -x \
&& addgroup -S stunnel \
&& adduser -S -D -H -h /dev/null -s /sbin/nologin -G stunnel -g stunnel stunnel \
&& echo "//dl-cdn.alpinelinux.org/alpine/latest-stable/main/x86_64/" >> /etc/apk/repositories \
&& apk update \
&& apk add --no-cache --update stunnel ca-certificates \
&& apk add --no-cache pcre openssl stunnel gettext python3 \
&& apk add --no-cache pcre openssl stunnel gettext python3 py3-pip \
&& apk add --no-cache --virtual build-deps build-base pcre-dev openssl-dev zlib zlib-dev wget make \
&& wget -O nginx-${NGINX_VERSION}.tar.gz http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz \
&& tar -zxvf nginx-${NGINX_VERSION}.tar.gz \
Expand Down Expand Up @@ -48,6 +48,7 @@ COPY index.html /usr/local/nginx/html/
COPY nginx-conf/nginx.conf /base-nginx.conf
COPY launch-nginx-server.sh launch-nginx-server.sh
COPY rtmp-conf-generator.py nginx-template.conf.j2 /
RUN touch /rtmp-configuration.json && chmod 744 /rtmp-configuration.json

EXPOSE 1935
EXPOSE 80
Expand Down

0 comments on commit bb76d59

Please sign in to comment.