update paho to v2

Reviewed-on: #48

.gitea/workflows/publish.yaml

@@ -14,10 +14,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
-
-    - name: Install Docker
-      run: curl -fsSL https://get.docker.com | sh
+      uses: actions/checkout@v4.1.1
 
     - name: Build Docker image
       run: docker build -t harbor.evanshome.io/library/py-eagle-mqtt:dev ./Docker/

.gitea/workflows/semantic-release.yaml

@@ -10,7 +10,7 @@ jobs:
     name: Patch
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4.1.1
       with:
         fetch-depth: '0'
     - name: Minor version for each merge
@@ -36,10 +36,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4.1.1
 
-    - name: Install Docker
-      run: curl -fsSL https://get.docker.com | sh
+    - name: Login to Harbor 
+      uses: docker/login-action@v2.2.0
+      with:
+        registry: harbor.evanshome.io
+        username: "robot$registry-bot"
+        password: ${{ secrets.HARBOR_PASSWORD }}
 
     - name: Build Docker image
       run: docker build -t harbor.evanshome.io/library/py-eagle-mqtt:latest ./Docker/
@@ -50,12 +54,10 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.REPO_PUSH_TOKEN }}
         WITH_V: true
+        GIT_API_TAGGING: false
 
     - name: tag with name
       run: docker tag  harbor.evanshome.io/library/py-eagle-mqtt:latest harbor.evanshome.io/library/py-eagle-mqtt:${{ steps.taggerFinal.outputs.new_tag }}
 
-    - name: Login to Harbor
-      run: docker login -u ${{ secrets.HARBOR_USERNAME }} -p ${{ secrets.HARBOR_PASSWORD }} harbor.evanshome.io
-
     - name: Push Docker image to Harbor
       run: docker push --all-tags harbor.evanshome.io/library/py-eagle-mqtt

.gitlab-ci.yml

@@ -31,7 +31,7 @@ build:
     - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
 
 release:
-  image: node:20.10.0-alpine3.18
+  image: node:20.11.1-alpine3.18
   stage: release
   only:
     refs:

Docker/Dockerfile

@@ -14,14 +14,20 @@ LABEL org.label-schema.vendor="Evan Richardson"
 LABEL org.label-schema.docker.cmd="docker run --name=py-eagle-mqtt -e MQTT_BROKER_IP=<IP> -e MQTT_BROKER_PORT=1883 -p 22042:22042 -d evanrich/py-eagle-mqtt"
 
 WORKDIR /app
+
 COPY requirements.txt /app
 COPY ./src/conf/logrotate/tHome /etc/logrotate.d/
+
 ENV PYTHONPATH=/app/src/python
-RUN apk --update add --no-cache logrotate \
-&& apk upgrade \
-&& pip3 install --no-cache-dir  --upgrade pip \
-&& pip3 install --no-cache-dir -r requirements.txt
+
+RUN apk --update add --no-cache logrotate && \
+    apk upgrade && \
+    pip3 install --no-cache-dir --upgrade pip && \
+    pip3 install --no-cache-dir -r requirements.txt && \
+    rm -rf /var/cache/apk/*
+
 COPY . /app
-CMD ["/app/src/bin/tHome-eagle.py", "-c", "/app/src/conf"]
+
+CMD ["python3", "-u", "/app/src/bin/tHome-eagle.py", "-c", "/app/src/conf", "-l", "stdout"]
 
 EXPOSE 22042

Docker/requirements.txt

@@ -1,3 +1,3 @@
-paho-mqtt==1.6.1
+paho-mqtt~=2.0.0
 bottle==0.12.25
 defusedxml==0.7.1

Docker/src/bin/dbg-msgHub.py

@@ -26,7 +26,7 @@ class Client ( mqtt.Client ):
       self.on_connect = Client.on_connect
       self.on_message = Client.on_message
       
-   def on_connect( self, userData, flags, rc ):
+   def on_connect( self, userData, flags, reason_code, properties ):
       self.subscribe( '#' )
 
    def on_message( self, userData, msg ):
@@ -62,4 +62,4 @@ client.loop_start()
 while True:
    pass
 
-client.loop_stop( force=True )
+client.loop_stop()