diff --git a/daemons/Dockerfile b/daemons/Dockerfile index da0fd6f..cea2369 100644 --- a/daemons/Dockerfile +++ b/daemons/Dockerfile @@ -2,6 +2,7 @@ FROM python:3.10-alpine RUN mkdir /opt/dcc && pip -q install pyserial ADD net-to-serial.py config.ini /opt/dcc +RUN python3 -q -m compileall /opt/dcc/net-to-serial.py EXPOSE 2560/tcp diff --git a/daemons/__init__.py b/daemons/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/daemons/simulator/Dockerfile b/daemons/simulator/Dockerfile index da0debf..4ba6659 100644 --- a/daemons/simulator/Dockerfile +++ b/daemons/simulator/Dockerfile @@ -2,6 +2,6 @@ FROM dcc/net-to-serial RUN apk update && apk add qemu-system-avr && mkdir /io ADD start.sh /opt/dcc -ADD CommandStation-EX-uno-*.elf /io +ADD CommandStation-EX*.elf /io ENTRYPOINT ["/opt/dcc/start.sh"] diff --git a/daemons/simulator/start.sh b/daemons/simulator/start.sh index be9abc1..6471bc3 100755 --- a/daemons/simulator/start.sh +++ b/daemons/simulator/start.sh @@ -2,11 +2,12 @@ PTY=0 +# if container is run with -ti pts/0 is already taken if [ -c /dev/pts/0 ]; then PTY=1 fi sed -i "s/ttyACM0/pts\/${PTY}/" /opt/dcc/config.ini -qemu-system-avr -machine uno -bios /io/CommandStation-EX-uno-*.elf -serial pty -daemonize +qemu-system-avr -machine uno -bios /io/CommandStation-EX*.elf -serial pty -daemonize /opt/dcc/net-to-serial.py