allow logging output of container

Reviewed-on: #45

.gitea/workflows/publish.yaml

@@ -0,0 +1,27 @@
+name: Build and publish Image
+run-name: ${{ gitea.actor }} is building py-eagle-mqtt image
+on:
+  push:
+    branches:
+      - '*'         # matches every branch that doesn't contain a '/'
+      - '*/*'       # matches every branch containing a single '/'
+      - '**'        # matches every branch
+      - '!master'   # excludes master
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4.1.1
+
+    - name: Build Docker image
+      run: docker build -t harbor.evanshome.io/library/py-eagle-mqtt:dev ./Docker/
+
+    - 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 harbor.evanshome.io/library/py-eagle-mqtt:dev
+      

.gitea/workflows/semantic-release.yaml

@@ -0,0 +1,59 @@
+name: Semantic Release and Changelog
+run-name: ${{ gitea.actor }} is running Semantic Release
+on:
+  push:
+    branches:
+      - 'master'
+
+jobs:
+  Patch:
+    name: Patch
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4.1.1
+      with:
+        fetch-depth: '0'
+    - name: Minor version for each merge
+      id: taggerDryRun
+      uses: anothrNick/github-tag-action@1.67.0
+      env:
+        GITHUB_TOKEN: ${{ secrets.REPO_PUSH_TOKEN }}
+        WITH_V: true
+        DRY_RUN: true
+
+    - name: echo new tag
+      run: |
+        echo "The next tag version will be: ${{ steps.taggerDryRun.outputs.new_tag }}"
+    - name: echo tag
+      run: |
+        echo "The current tag is: ${{ steps.taggerDryRun.outputs.tag }}"
+    - name: echo part
+      run: |
+        echo "The version increment was: ${{ steps.taggerDryRun.outputs.part }}"
+  
+  Build-and-Publish:
+    name: Build and Publish
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4.1.1
+
+    - name: Build Docker image
+      run: docker build -t harbor.evanshome.io/library/py-eagle-mqtt:latest ./Docker/
+
+    - name: Minor version for each merge
+      id: taggerFinal
+      uses: anothrNick/github-tag-action@1.67.0
+      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

@@ -6,15 +6,19 @@
 stages:
 #- test
 - build
-#- push_local
 - release
-#- push_dockerhub
+- push_local
+##- push_dockerhub
 
 build:
-  image: docker:24.0.5-dind
+  image: docker:24.0.7-dind
   stage: build
+  only:
+    refs:
+    - tags
+    - branches
   services:
-    -  name: docker:24.0.5-dind
+    -  name: docker:24.0.7-dind
        command: ["--tls=false"]
   variables:
     DOCKER_DRIVER: overlay2
@@ -51,3 +55,26 @@ release:
   artifacts:
     paths:
     - CHANGELOG.md
+
+push local:
+  image: docker:24.0.7-dind
+  stage: push_local
+  services:
+    -  name: docker:24.0.7-dind
+       command: ["--tls=false"]
+  variables:
+    DOCKER_DRIVER: overlay2
+    DOCKER_HOST: tcp://docker:2375
+    DOCKER_TLS_CERTDIR: ""
+    GIT_STRATEGY: none
+    FF_GITLAB_REGISTRY_HELPER_IMAGE: 1
+  only:
+  - master
+  script:
+    - 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,23 @@
+## [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)
 
 

Docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.11-alpine
+FROM python:3.12-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"]
 
 EXPOSE 22042

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__)