From bb76d593af5e0e669df754494da0a77f5d1d11a9 Mon Sep 17 00:00:00 2001
From: Michael Kamprath <michael@kamprath.net>
Date: Mon, 14 Mar 2022 12:09:20 -0700
Subject: [PATCH] updated package versions

---
 .gitignore                                         | 5 +++++
 CHANGELOG.md                                       | 2 ++
 deployment-scripts/.gitignore                      | 1 -
 deployment-scripts/upcloud/.gitignore              | 2 ++
 deployment-scripts/upcloud/requirements.txt        | 1 +
 deployment-scripts/{ => upcloud}/upcloud-deploy.py | 0
 multistreaming-server/Dockerfile                   | 9 +++++----
 7 files changed, 15 insertions(+), 5 deletions(-)
 create mode 100644 deployment-scripts/upcloud/.gitignore
 create mode 100644 deployment-scripts/upcloud/requirements.txt
 rename deployment-scripts/{ => upcloud}/upcloud-deploy.py (100%)

diff --git a/.gitignore b/.gitignore
index b6e4761..e80604b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -127,3 +127,8 @@ dmypy.json
 
 # Pyre type checker
 .pyre/
+
+
+# MacOS
+.DS_Store
+
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b58a683..ca10f55 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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
diff --git a/deployment-scripts/.gitignore b/deployment-scripts/.gitignore
index d57f84c..aff0c81 100644
--- a/deployment-scripts/.gitignore
+++ b/deployment-scripts/.gitignore
@@ -1,3 +1,2 @@
 # ignore python environments set up for development
-upcloud/
 linode/
diff --git a/deployment-scripts/upcloud/.gitignore b/deployment-scripts/upcloud/.gitignore
new file mode 100644
index 0000000..16585bd
--- /dev/null
+++ b/deployment-scripts/upcloud/.gitignore
@@ -0,0 +1,2 @@
+# virtual environment
+.venv
diff --git a/deployment-scripts/upcloud/requirements.txt b/deployment-scripts/upcloud/requirements.txt
new file mode 100644
index 0000000..8a29244
--- /dev/null
+++ b/deployment-scripts/upcloud/requirements.txt
@@ -0,0 +1 @@
+upcloud_api
\ No newline at end of file
diff --git a/deployment-scripts/upcloud-deploy.py b/deployment-scripts/upcloud/upcloud-deploy.py
similarity index 100%
rename from deployment-scripts/upcloud-deploy.py
rename to deployment-scripts/upcloud/upcloud-deploy.py
diff --git a/multistreaming-server/Dockerfile b/multistreaming-server/Dockerfile
index 6e9dd12..2c30a4f 100644
--- a/multistreaming-server/Dockerfile
+++ b/multistreaming-server/Dockerfile
@@ -1,12 +1,12 @@
-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 \
@@ -14,7 +14,7 @@ RUN set -x \
  && 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 \
@@ -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