More fixes

Author: tt2468

.github/workflows/main.yml

@@ -16,6 +16,8 @@ jobs:
 
       - name: Package
         uses: JackMcKew/pyinstaller-action-windows@main
+        with:
+          path: src
 
       - name: Upload Artifacts
         uses: actions/upload-artifact@v2

Dockerfile

@@ -1,4 +1,4 @@
 From python:3
-COPY main.py entrypoint.sh ./
-RUN pip install -r requirements.txt
+COPY src/main.py entrypoint.sh ./
+RUN pip install -r src/requirements.txt
 ENTRYPOINT [ "sh", "./entrypoint.sh" ]

docker-compose.yml

@@ -5,11 +5,10 @@ services:
     build: .
     restart: unless-stopped
     environment:
-      - API_ADDRESS=0.0.0.0   # Address of this machine
-      - API_PORT=4445           # Port you wish to use for API
-      - API_KEY=                # Auth key you wish to set
-      - OBS_ADDRESS=127.0.0.1   # IP of machine running OBS Studio
-      - OBS_PORT=4444           # OBS port
-      - OBS_PASSWORD=           # OBS password, if used
+      - API_ADDRESS=0.0.0.0         # Address of this machine
+      - API_PORT=4445               # Port you wish to use for API
+      - API_KEY=                    # Auth key you wish to set
+      - OBS_URL=ws://127.0.0.1:4444 # WebSocket Connect URL
+      - OBS_PASSWORD=               # OBS password, if used
     ports:
       - "4445:4445"             # Set to same value as API_PORT

entrypoint.sh

@@ -8,16 +8,14 @@ bind_to_port = @api_port@
 authentication_key = @api_key@
 
 [obsws]
-ws_address = @obs_address@
-ws_port = @obs_port@
+ws_url = @obs_url@
 ws_password = @obs_password@
 EOF
 sed -i "s|@api_address@|${API_ADDRESS}|" ./config.ini
 sed -i "s|@api_port@|${API_PORT}|" ./config.ini
 sed -i "s|@api_key@|${API_KEY}|" ./config.ini
 
-sed -i "s|@obs_address@|${OBS_ADDRESS}|" ./config.ini
-sed -i "s|@obs_port@|${OBS_PORT}|" ./config.ini
+sed -i "s|@obs_url@|${OBS_URL}|" ./config.ini
 sed -i "s|@obs_password@|${OBS_PASSWORD}|" ./config.ini
 
 # Start the server