Merge pull request 'chore(deps): update docker docker tag to v28.2.2' (#118) from renovate/docker-28.x into master

Reviewed-on: #118

.gitea/workflows/semantic-release.yaml

@@ -0,0 +1,64 @@
+name: ci
+
+on:
+  schedule:
+    - cron: "0 10 * * *"
+  push:
+    branches:
+      - "**"
+    tags:
+      - "v*.*.*"
+  pull_request:
+    branches:
+      - "main"
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4.2.2
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5.7.0
+        with:
+          # list of Docker images to use as base name for tags
+          images: |
+            harbor.evanshome.io/library/py-eagle-mqtt       
+          # generate Docker tags based on the following events/attributes
+          tags: |
+            type=schedule
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{raw}}
+            type=semver,pattern={{version}}
+            type=sha            
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3.10.0
+      - name: Login to Harbor
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v3.4.0
+        with:
+          registry: harbor.evanshome.io
+          username: ${{ secrets.HARBOR_USERNAME }}
+          password: ${{ secrets.HARBOR_PASSWORD }}
+
+      - name: echo new tag
+        run: |
+          echo "${{ steps.meta.outputs.tags }}"        
+        
+
+      # - name: Build and push
+      #   uses: docker/build-push-action@v6.15.0
+      #   with:
+      #     context: ./Docker/
+      #     push: ${{ github.event_name != 'pull_request' }}
+      #     tags: ${{ steps.meta.outputs.tags }}
+      #     labels: ${{ steps.meta.outputs.labels }}
+
+
+
+
+
+
+

.gitea/workflows/tag-release.yaml

@@ -0,0 +1,61 @@
+name: Bump version
+on:
+  pull_request:
+    types:
+      - closed
+    branches:
+      - master
+
+jobs:
+  create_release_tag:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4.2.2
+        with:
+          ref: ${{ github.event.pull_request.merge_commit_sha }}
+          fetch-depth: '0'
+      
+      - name: Create Release Tag
+        id: taggerFinal
+        uses: anothrNick/github-tag-action@1.71.0
+        with:
+         GITHUB_TOKEN: ${{ secrets.REPO_PUSH_TOKEN }}
+         WITH_V: true
+         GIT_API_TAGGING: false
+         DEFAULT_BUMP: patch
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5.7.0
+        with:
+          # list of Docker images to use as base name for tags
+          images: |
+            harbor.evanshome.io/library/py-eagle-mqtt       
+          # generate Docker tags based on the following events/attributes
+          flavor: |
+            latest=true
+          tags: |
+            type=schedule
+            type=ref,event=branch
+            type=ref,event=pr
+            type=raw,value=${{ steps.taggerFinal.outputs.new_tag }}
+            type=semver,pattern={{raw}}
+            type=semver,pattern={{version}}
+            type=sha            
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3.10.0
+      - name: Login to Harbor
+        uses: docker/login-action@v3.4.0
+        with:
+          registry: harbor.evanshome.io
+          username: ${{ secrets.HARBOR_USERNAME }}
+          password: ${{ secrets.HARBOR_PASSWORD }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v6.15.0
+        with:
+          context: ./Docker/
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

.gitlab-ci.yml

@@ -4,76 +4,34 @@
 # See https://docs.gitlab.com/ee/ci/variables/#priority-of-environment-variables
 
 stages:
-- test
+#- test
 - build
-- push_local
 - release
-- push_dockerhub
-
-.docker_base:
-  image: docker:20.10.6-dind
-  services:
-    - name: docker:20.10.6-dind
-      command: ["--tls=false"]
-  variables:
-    DOCKER_DRIVER: overlay
-    DOCKER_HOST: tcp://127.0.0.1:2375/
-    DOCKER_TLS_CERTDIR: ""
-    IMAGE_TAG: "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
-    FF_GITLAB_REGISTRY_HELPER_IMAGE: 1
-  before_script:
-    - docker version
-    - docker info
-    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
+- push_local
+##- push_dockerhub
 
 build:
-  extends:
-    - .docker_base
+  image: docker:28.2.2-dind
   stage: build
-  script:
-  - docker pull $CI_REGISTRY_IMAGE:latest || true
-  - >
-    docker build
-    --pull
-    --cache-from $CI_REGISTRY_IMAGE:latest
-    --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
-    --build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')
-    --build-arg VCS_REF=$CI_COMMIT_SHORT_SHA
-    ./Docker/
-  - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
-
-push local:
-  extends:
-    - .docker_base
-  stage: push_local
-  variables:
-    GIT_STRATEGY: none
   only:
-  - master
-  script:
-  - docker pull $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
-  - docker tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA $CI_REGISTRY_IMAGE:latest
-  - docker push $CI_REGISTRY_IMAGE:latest
-
-push dockerhub:
-  extends:
-    - .docker_base
-  stage: push_dockerhub
+    refs:
+    - tags
+    - branches
+  services:
+    -  name: docker:28.2.2-dind
+       command: ["--tls=false"]
   variables:
-    GIT_STRATEGY: none
-    CI_DOCKERHUB_IMAGE: index.docker.io/evanrich/py-eagle-mqtt
-    CI_DOCKERHUB_REGISTRY: docker.io
-  only:
-  - tags
+    DOCKER_DRIVER: overlay2
+    DOCKER_HOST: tcp://docker:2375
+    DOCKER_TLS_CERTDIR: ""
+    FF_GITLAB_REGISTRY_HELPER_IMAGE: 1
   script:
-  - docker pull $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
-  - docker tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA $CI_DOCKERHUB_IMAGE:$CI_COMMIT_REF_NAME 
-  - docker tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA $CI_DOCKERHUB_IMAGE:latest
-  - docker login -u "$CI_DOCKERHUB_USER" -p "$CI_DOCKERHUB_PASSWORD" $CI_DOCKERHUB_REGISTRY
-  - docker push $CI_DOCKERHUB_IMAGE --all-tags
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+    - docker build -t $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA --build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') --build-arg VCS_REF=$CI_COMMIT_SHORT_SHA ./Docker/
+    - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
 
 release:
-  image: node:16-alpine3.13
+  image: node:22.12.0-alpine3.19
   stage: release
   only:
     refs:
@@ -83,62 +41,40 @@ release:
     - /^(([0-9]+)\.)?([0-9]+)\.x/
     # This matches pre-releases
     - /^([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+[0-9A-Za-z-]+)?$/ 
+  except:
+    refs:
+      - tags
   script:
     - touch CHANGELOG.md
     - apk add --no-cache git
-    - npm install @semantic-release/gitlab @semantic-release/changelog
-      @semantic-release/git conventional-changelog-eslint
+    - git config user.email "ci-bot@evanshome.io"
+    - git config user.name "ci-bot"
+    - npm install @semantic-release/gitlab@12.1.1 @semantic-release/changelog@6.0.3
+      @semantic-release/git@10.0.1 conventional-changelog-eslint@5.0.0
     - npx semantic-release
   artifacts:
     paths:
     - CHANGELOG.md
 
-sast:
-  stage: test
-include:
-- template: Security/SAST.gitlab-ci.yml
-
-sonarqube-check:
-  stage: test
-  image: 
-    name: sonarsource/sonar-scanner-cli:4.6
-    entrypoint: [""]
+push local:
+  image: docker:28.2.2-dind
+  stage: push_local
+  services:
+    -  name: docker:28.2.2-dind
+       command: ["--tls=false"]
   variables:
-    SONAR_USER_HOME: "${CI_PROJECT_DIR}/.sonar"  # Defines the location of the analysis task cache
-    GIT_DEPTH: "0"  # Tells git to fetch all the branches of the project, required by the analysis task
-  cache:
-    key: "${CI_JOB_NAME}"
-    paths:
-      - .sonar/cache
-  script: 
-    - sonar-scanner
-  allow_failure: true
+    DOCKER_DRIVER: overlay2
+    DOCKER_HOST: tcp://docker:2375
+    DOCKER_TLS_CERTDIR: ""
+    GIT_STRATEGY: none
+    FF_GITLAB_REGISTRY_HELPER_IMAGE: 1
   only:
-    - master # or the name of your main branch
-    - branches
-
-trivy:
-  stage: test
-  extends:
-    - .docker_base
-  before_script:
-    - export TRIVY_VERSION=$(wget -qO - "https://api.github.com/repos/aquasecurity/trivy/releases/latest" | grep '"tag_name":' | sed -E 's/.*"v([^"]+)".*/\1/')
-    - echo $TRIVY_VERSION
-    - wget --no-verbose https://github.com/aquasecurity/trivy/releases/download/v${TRIVY_VERSION}/trivy_${TRIVY_VERSION}_Linux-64bit.tar.gz -O - | tar -zxvf -
-  allow_failure: true
+  - master
   script:
-    # Build image
-    - docker build -t $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA ./Docker/
-    # Build report
-    - ./trivy --exit-code 0 --cache-dir .trivycache/ --no-progress --format template --template "@contrib/gitlab.tpl" -o gl-container-scanning-report.json image $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
-    # Print report
-    - ./trivy --exit-code 0 --cache-dir .trivycache/ --no-progress --severity HIGH image $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
-    # Fail on severe vulnerabilities
-    - ./trivy --exit-code 1 --cache-dir .trivycache/ --severity CRITICAL --no-progress image $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
-  cache:
-    paths:
-      - .trivycache/
-  # Enables https://docs.gitlab.com/ee/user/application_security/container_scanning/ (Container Scanning report is available on GitLab EE Ultimate or GitLab.com Gold)
-  artifacts:
-    reports:
-      container_scanning: gl-container-scanning-report.json
+    - echo $CI_COMMIT_TAG
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+    - docker pull $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
+    - docker tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA $CI_REGISTRY_IMAGE:latest
+    - docker push $CI_REGISTRY_IMAGE:latest
+
+  

CHANGELOG.md

@@ -1,3 +1,41 @@
+## [1.7.10](https://gitlab.evanshome.io/erichardson/py-eagle-mqtt/compare/v1.7.9...v1.7.10) (2023-12-03)
+
+
+### Build
+
+* fix build pipeline order ([1cf67d1](https://gitlab.evanshome.io/erichardson/py-eagle-mqtt/commit/1cf67d139b8ce3954a42afeeef49262c72d9b0a5))
+
+### CI
+
+* add branches to refs for building ([e0da9b1](https://gitlab.evanshome.io/erichardson/py-eagle-mqtt/commit/e0da9b110e69fc4f18f6588d297589ca71a27c08))
+* Add push latest tag on master ([8e6130d](https://gitlab.evanshome.io/erichardson/py-eagle-mqtt/commit/8e6130d9195c19933054d9a4efbeeb3d025b5301))
+* fix ordering of stages ([385c1d8](https://gitlab.evanshome.io/erichardson/py-eagle-mqtt/commit/385c1d88d85e64591fd0d3814111a7e335ea45f8))
+
+## [1.7.9](https://gitlab.evanshome.io/erichardson/py-eagle-mqtt/compare/v1.7.8...v1.7.9) (2023-12-03)
+
+
+### Build
+
+* bump docker base to python:3.12-alpine ([6489f3d](https://gitlab.evanshome.io/erichardson/py-eagle-mqtt/commit/6489f3d01a71fba8e1a4ac35de2b0bffdf2529bd))
+
+## [1.7.8](https://gitlab.evanshome.io/erichardson/py-eagle-mqtt/compare/v1.7.7...v1.7.8) (2023-12-03)
+
+
+### ci
+
+* fix semantic versioning and docker push to local registry ([9ce6bb5](https://gitlab.evanshome.io/erichardson/py-eagle-mqtt/commit/9ce6bb579847fba7fd31cc7ece4bcbb0661247b8))
+
+### Fix
+
+* semantic versioning and docker push to local registry ([08069d6](https://gitlab.evanshome.io/erichardson/py-eagle-mqtt/commit/08069d61d135eff8c2ee5b210279589c4e4eed8f))
+
+## [1.7.6](https://gitlab.evanrichardsonphotography.com/erichardson/py-eagle-mqtt/compare/v1.7.5...v1.7.6) (2021-05-10)
+
+
+### Build
+
+* Change docker driver to overlay2 ([13cb517](https://gitlab.evanrichardsonphotography.com/erichardson/py-eagle-mqtt/commit/13cb51706b97f25486f62dd6985903e834d28ee2))
+
 ## [1.7.5](https://gitlab.evanrichardsonphotography.com/erichardson/py-eagle-mqtt/compare/v1.7.4...v1.7.5) (2021-05-09)
 
 

Docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.9.4-alpine3.13
+FROM python:3.13-alpine
 LABEL maintainer="Evan Richardson (evanrich81[at]gmail.com)"
 
 ARG BUILD_DATE
@@ -14,13 +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 \
-&& 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.5.1
-bottle==0.12.19
+paho-mqtt==2.1.0
+bottle==0.13.4
 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()

Docker/src/python/tHome/broker/connect.py

@@ -7,11 +7,11 @@ from . import config
 import paho.mqtt.client as mqtt
 
 #===========================================================================
-class Client( mqtt.Client ):
+class Client(  mqtt.Client ):
    """Logging client
    """
    def __init__( self, log=None ):
-      mqtt.Client.__init__( self )
+      mqtt.Client.__init__( self, mqtt.CallbackAPIVersion.VERSION2 )
       self._logger = log
       # Restore callbacks overwritten by stupid mqtt library
       self.on_log = Client.on_log

Docker/src/python/tHome/util/fimport.py

@@ -3,8 +3,9 @@
 # Arbitrary file importing utility.  Does NOT modify sys.modules
 #
 #===========================================================================
-import imp
+#import importlib
 import os
+import types
 
 def fimport( filePath ):
    # Read the file and compile the code.  This will fail if the file
@@ -19,7 +20,7 @@ def fimport( filePath ):
    rootName, ext = os.path.splitext( fileName )
 
    # Create a new module and exec the code in it's context.  
-   m = imp.new_module( rootName )
+   m = types.ModuleType( rootName )
    m.__file__ = absPath
    exec(code, m.__dict__)
 

renovate.json

@@ -0,0 +1,12 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:base",
+    ":semanticCommits"
+  ],
+  "prConcurrentLimit": 5,
+  "labels": [
+      "upgrade", 
+      "bot"
+    ]
+}