Skip to content

Commit

Permalink
fix (docker): fixed certificate issue for mopidy extensions by upgrad…
Browse files Browse the repository at this point in the history
…ing to debian bullseye

- fixed file logging issue
  • Loading branch information
Mario Lukas committed Apr 29, 2022
1 parent ca15f65 commit 6980399
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 8 deletions.
5 changes: 4 additions & 1 deletion docker-compose.ui-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ services:
args:
SNAPCASTVERSION: 0.26.0
container_name: hydraplay
environment:
PYTHONUNBUFFERED: 0
ports:
- 8080:8080
- 1780:1780
Expand All @@ -24,4 +26,5 @@ services:
# mount src folder for development
- ./src/:/app/
- ./hydra.private.json:/tmp/hydra.config.json
- ./pipes/:/tmp/additional_streams
- ./pipes/:/tmp/additional_streams
entrypoint: ["python3", "-u", "/app/hydraplay.sh", "--config", "/tmp/hydra.config.json", "--loglevel", "debug"]
4 changes: 2 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ COPY src/ui /ui
RUN ng build


FROM debian:buster-slim as hydraplay
FROM debian:bullseye-slim as hydraplay

#======================================= MOPIDY INSTALLATION ===================================================#
RUN apt-get update && \
Expand All @@ -28,7 +28,7 @@ RUN apt-get update && \
ca-certificates \
python3 \
python3-pip \
python3-crypto \
python3-cryptography \
python3-setuptools \
python3-pykka \
python3-gst-1.0 \
Expand Down
6 changes: 4 additions & 2 deletions docker/Dockerfile.ui.dev
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:buster-slim as hydraplay
FROM debian:bullseye-slim as hydraplay

#======================================= MOPIDY INSTALLATION ===================================================#
RUN apt-get update && \
Expand All @@ -10,7 +10,7 @@ RUN apt-get update && \
ca-certificates \
python3 \
python3-pip \
python3-crypto \
python3-cryptography \
python3-setuptools \
python3-pykka \
python3-gst-1.0 \
Expand Down Expand Up @@ -54,6 +54,8 @@ RUN export SNAPCAST_ARCH=$TARGETARCH \
&& mkdir -p /app \
&& mkdir -p /temp/additional_streams \
&& mkdir -p /root/.config/snapcast/ \
&& mkdir -p /var/log/hydraplay/ \
&& touch /var/log/hydraplay/hydraplay.log \
&& touch /tmp/hydra.config.json \
&& chmod 664 /tmp/hydra.config.json \
&& chmod a+x /app/hydraplay.sh \
Expand Down
5 changes: 2 additions & 3 deletions src/hydraplay/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,11 @@ def main():
parser.add_argument("--port", action="store", type=int, dest="port",
help="Specify the port on which to bind the server")

parser.add_argument("-c", "--config", action="store", required=False, dest="config",
parser.add_argument("--config", action="store", required=False, dest="config",
default="/etc/hydraplay/hydra.config.json",
help="Specify the config file to use. HydraPlay needs to have write access for the config dialog to work. Defaults to /etc/hydraplay/hydra.config.json")

parser.add_argument("--logfile", action="store", dest="logConf",
default="/var/log/hydraplay/hydraplay.log",
parser.add_argument("--logfile", action="store", dest="logConf", default=None,
help="Define the log file and path for logging. Defaults to /var/log/hydraplay/hydraplay.log")

parser.add_argument("--loglevel", action="store", dest="logLevel", default="debug",
Expand Down

0 comments on commit 6980399

Please sign in to comment.