Change base docker image (#3)

* Change base docker image * Rename variables and add logging * Add missing docker image to docker run example --------- Co-authored-by: Aitor Iturrioz <[email protected]>
Tknika · Mar 16, 2024 · 7dde5ee · 7dde5ee
1 parent e1a074e
commit 7dde5ee
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.9.2-slim
+FROM python:3.9-slim-bullseye
 WORKDIR /app
 COPY requirements.txt ./
 RUN apt-get update && apt-get install build-essential -y

diff --git a/README.md b/README.md
@@ -59,7 +59,7 @@ For example:
 
 After building the image, execute it with docker run.
 
-`docker run --name ${CONTAINER_NAME} --privileged --rm -d -v /run/systemd/system:/run/systemd/system -v /var/run/dbus/system_bus_socket:/var/run/dbus/system_bus_socket -v /bin/systemctl:/bin/systemctl -p 5558:5558 -e LOG_LEVEL=DEBUG`
+`docker run --name ${CONTAINER_NAME} --privileged --rm -d -v /run/systemd/system:/run/systemd/system -v /var/run/dbus/system_bus_socket:/var/run/dbus/system_bus_socket -v /bin/systemctl:/bin/systemctl -p 5558:5558 -e LOG_LEVEL=DEBUG iombian-shutdown-service:latest`
 
 - **--name** is used to define the name of the created container.
 

diff --git a/src/main.py b/src/main.py
@@ -8,8 +8,9 @@
 from shutdown_commands import ShutdownCommands
 
 LOG_LEVEL = os.environ.get("LOG_LEVEL", logging.INFO)
-SHUTDOWN_EVENTS_HOST = "0.0.0.0"
-SHUTDOWN_EVENTS_PORT = int(os.environ.get("SHUTDOWN_EVENTS_PORT", 5558))
+SHUTDOWN_SERVICE_PORT = int(os.environ.get("SHUTDOWN_PORT", 5558))
+
+SHUTDOWN_SERVICE_HOST = "0.0.0.0"
 
 logging.basicConfig(format="%(asctime)s %(levelname)-8s - %(name)-16s - %(message)s", level=LOG_LEVEL)
 logger = logging.getLogger(__name__)
@@ -29,7 +30,7 @@ def signal_handler(sig, frame):
 
     shutdown_commands = ShutdownCommands()
 
-    server = CommunicationServer(shutdown_commands, host=SHUTDOWN_EVENTS_HOST, port=SHUTDOWN_EVENTS_PORT)
+    server = CommunicationServer(shutdown_commands, host=SHUTDOWN_SERVICE_HOST, port=SHUTDOWN_SERVICE_PORT)
     server.start()
 
     signal.signal(signal.SIGINT, signal_handler)

diff --git a/src/shutdown_commands.py b/src/shutdown_commands.py
@@ -1,12 +1,16 @@
+import logging
 import os
 
+logger = logging.getLogger(__name__)
 
 class ShutdownCommands:
     def __init__(self):
         pass
 
     def shutdown(self):
+        logging.debug("Shutting down the device.")
         os.system("systemctl poweroff")
 
     def reboot(self):
+        logging.debug("Rebooting the device.")
         os.system("systemctl reboot")