From 6c5fc368be5679befbb8da757126c414b09bdf4e Mon Sep 17 00:00:00 2001
From: atopilski <atopilski@gmail.com>
Date: Fri, 7 Jul 2023 21:25:53 -0600
Subject: [PATCH] Docker review

---
 Dockerfile                  | 11 ++++++++---
 build/env                   |  2 +-
 docker/docker-entrypoint.sh | 22 ++++++++++++++++++++++
 docker/fastocloud.conf      | 21 +++++++++++++++++++++
 4 files changed, 52 insertions(+), 4 deletions(-)
 create mode 100644 docker/docker-entrypoint.sh
 create mode 100644 docker/fastocloud.conf

diff --git a/Dockerfile b/Dockerfile
index dae655a..274a7c0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@ LABEL maintainer="Alexandr Topilski <support@fastogt.com>"
 
 ENV USER fastocloud
 ENV APP_NAME fastocloud
-ENV PROJECT_DIR /usr/src/fastocloud
+ENV PROJECT_DIR /usr/src/$APP_NAME
 RUN useradd -m -U -d /home/$USER $USER -s /bin/bash
 
 COPY . $PROJECT_DIR
@@ -22,13 +22,18 @@ RUN set -ex; \
   cd $PROJECT_DIR/build && PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig python3 build.py release $PREFIX; \
   rm -rf $PYFASTOGT_DIR $PROJECT_DIR # && apt-get purge -y --auto-remove $BUILD_DEPS
 
+COPY docker/$APP_NAME.conf /etc/
 RUN mkdir /var/run/$APP_NAME
 RUN chown $USER:$USER /var/run/$APP_NAME
-VOLUME /var/run/$APP_NAME
+RUN chown $USER:$USER /var/lib/dbus/ # for unique machine-id
+#VOLUME /var/run/$APP_NAME
+
+COPY docker/docker-entrypoint.sh /usr/local/bin/
+RUN chmod 755 /usr/local/bin/docker-entrypoint.sh
 
 USER $USER
 WORKDIR /home/$USER
 
-ENTRYPOINT ["fastocloud"]
+ENTRYPOINT ["docker-entrypoint.sh"]
 
 EXPOSE 6317 8000 7000 6000
diff --git a/build/env b/build/env
index 87955c8..2001764 160000
--- a/build/env
+++ b/build/env
@@ -1 +1 @@
-Subproject commit 87955c8e0ef311735b8305cc026c4d66942be3d8
+Subproject commit 20017646e9707187190f21de8d0a3978ac74dea4
diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
new file mode 100644
index 0000000..9080134
--- /dev/null
+++ b/docker/docker-entrypoint.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+#set -e
+
+regenerate_dbus_machine_id() {
+    rm -f /var/lib/dbus/machine-id
+    rm -f /etc/machine-id
+    dbus-uuidgen --ensure
+}
+
+CONTAINER_ALREADY_STARTED="CONTAINER_ALREADY_STARTED_PLACEHOLDER"
+if [ ! -e $CONTAINER_ALREADY_STARTED ]; then
+    touch $CONTAINER_ALREADY_STARTED
+	regenerate_dbus_machine_id
+else
+    echo "machine-id already was regenerated"
+fi
+
+if [ "${1#-}" != "$1" ]; then
+	set -- fastocloud "$@"
+fi
+
+exec "$@"
diff --git a/docker/fastocloud.conf b/docker/fastocloud.conf
new file mode 100644
index 0000000..89c0e43
--- /dev/null
+++ b/docker/fastocloud.conf
@@ -0,0 +1,21 @@
+[settings]
+log_path=~/fastocloud.log
+log_level=INFO
+host=0.0.0.0:6317
+alias=0.0.0.0
+
+hls_host=http://0.0.0.0:8000
+vods_host=http://0.0.0.0:7000
+cods_host=http://0.0.0.0:6000
+
+hls_dir=~/streamer/hls
+vods_dir=~/streamer/vods
+cods_dir=~/streamer/cods
+timeshifts_dir=~/streamer/timeshifts
+feedback_dir=~/streamer/feedback
+proxy_dir=~/streamer/proxy
+data_dir=~/streamer/data
+
+cods_ttl=600
+pyfastostream_path=/usr/local/bin/pyfastostream
+files_ttl=604800