address PR reviews

Author: Bilb

.dockerignore

@@ -6,4 +6,5 @@ docker-compose*
 README.md
 LICENSE
 .vscode
+*.sock
 

docker/DockerFile.dev

@@ -1,21 +1,26 @@
 # check docker/Readme.md
+FROM debian:stable
 
-FROM ubuntu:impish
-RUN apt update
-RUN apt upgrade -y
+RUN apt-get update
+RUN apt-get upgrade -y
 
-RUN apt-get install -y locales && locale-gen en_US.UTF-8
-ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
+# we need this to make https://deb.oxen.io fetches work
+RUN apt-get install -y ca-certificates
 
-RUN DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt -y install curl build-essential libssl-dev pkg-config lsb-release
-RUN curl -so /etc/apt/trusted.gpg.d/oxen.gpg https://deb.oxen.io/pub.gpg
-RUN echo "deb https://deb.oxen.io $(lsb_release -sc) main" | tee /etc/apt/sources.list.d/oxen.list
-RUN apt update
-RUN apt -y install python3-oxenmq python3-oxenc python3-pyonionreq python3-coloredlogs python3-uwsgidecorators python3-flask python3-cryptography python3-nacl python3-pil python3-protobuf python3-openssl python3-qrencode python3-better-profanity python3-sqlalchemy python3-sqlalchemy-utils uwsgi-plugin-python3
+COPY contrib/deb.oxen.io.gpg /etc/apt/trusted.gpg.d/oxen.gpg
+
+
+# there is no lsb-release package on the base debian build
+RUN echo "deb https://deb.oxen.io $(cat /etc/os-release | grep VERSION_CODENAME | cut -d "=" -f2) main" > /etc/apt/sources.list.d/oxen.list
+RUN cat /etc/apt/sources.list.d/oxen.list
+RUN apt-get update
+RUN apt -y install python3-oxenmq python3-oxenc python3-pyonionreq python3-coloredlogs python3-uwsgidecorators python3-flask \
+    python3-cryptography python3-nacl python3-pil python3-protobuf python3-openssl python3-qrencode python3-better-profanity \
+    python3-sqlalchemy python3-sqlalchemy-utils uwsgi-plugin-python3
 
 
 # just add an alias to the pysogs-start command
-RUN echo -e '#!/bin/bash\nuwsgi docker/uwsgi-sogs-docker.ini' > /usr/bin/pysogs && \
+RUN echo '#!/bin/bash\nuwsgi docker/uwsgi-sogs-docker.ini' > /usr/bin/pysogs && \
     chmod +x /usr/bin/pysogs
 
 

docker/Readme.md

@@ -2,9 +2,13 @@
 
 The file DockerFile.dev is specifically made for development if you are not running linux.
 It lets you create a docker running linux and the pysogs in it even if you are running Macos or Windows.
-It creates a docker container with the content of this git reposotiry mounted.
+It creates a docker container with the content of this git repository mounted.
 Basically, whatever you edit in this repository will be represented on the docker container. So when you run the container, it will run your code.
 
+# Not for production use
+
+This docker image is strictly for development use and not supported for production use.
+
 ## Build the container image
 
 You need to have docker installed on your computer. Follow the docker documentation for your system first.

sogs/config.py

@@ -64,7 +64,7 @@ def load_config():
 
     logger.info(f"Loading config from {conf_ini}")
     cp = configparser.ConfigParser()
-    cp.read(conf_ini)
+    cp.read(conf_ini, encoding='utf-8')
 
     # Set log level up first (we'll set it again below, mainly to log it if we have debug logging
     # enabled).