chore(release): 1.7.8 [skip ci]

## [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](9ce6bb5798))

### Fix

* semantic versioning and docker push to local registry ([08069d6](08069d61d1))

.gitlab-ci.yml

@@ -4,82 +4,50 @@
 # See https://docs.gitlab.com/ee/ci/variables/#priority-of-environment-variables
 
 stages:
-- test
+#- test
 - build
-- push_local
+#- push_local
-- push_dockerhub
+- release
-
+#- push_dockerhub
-.docker_base:
-  image: docker:18.09.7-dind
-  services:
-    - docker:18.09.7-dind
-  variables:
-    DOCKER_DRIVER: overlay
-    DOCKER_HOST: tcp://localhost:2375/
-    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
 
 build:
-  extends:
+  image: docker:24.0.5-dind
-    - .docker_base
   stage: build
+  services:
+    -  name: docker:24.0.5-dind
+       command: ["--tls=false"]
+  variables:
+    DOCKER_DRIVER: overlay2
+    DOCKER_HOST: tcp://docker:2375
+    DOCKER_TLS_CERTDIR: ""
+    FF_GITLAB_REGISTRY_HELPER_IMAGE: 1
   script:
-  - docker pull $CI_REGISTRY_IMAGE:latest || true
+    - 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 build
-    --pull
-    --cache-from $CI_REGISTRY_IMAGE:latest
-    --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
-    ./Docker/
     - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
 
-push local:
+release:
-  extends:
+  image: node:20.10.0-alpine3.18
-    - .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
-
-release_job:
   stage: release
-  image: registry.gitlab.com/gitlab-org/release-cli:latest
-  rules:
-    - if: $CI_COMMIT_TAG
-  script:
-    - echo 'running release_job'
-  release:
-    name: 'Release $CI_COMMIT_TAG'
-    description: 'Created using the release-cli'
-    tag_name: '$CI_COMMIT_TAG'
-    ref: '$CI_COMMIT_TAG'
-    
-push dockerhub:
-  extends:
-    - .docker_base
-  stage: push_dockerhub
-  variables:
-    GIT_STRATEGY: none
-    CI_DOCKERHUB_IMAGE: index.docker.io/evanrich/py-eagle-mqtt
-    CI_DOCKERHUB_REGISTRY: docker.io
   only:
+    refs:
+    - master
+    - alpha
+    # This matches maintenance branches
+    - /^(([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:
-  - docker pull $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
+    - touch CHANGELOG.md
-  - docker tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA $CI_DOCKERHUB_IMAGE:$CI_COMMIT_REF_NAME $CI_DOCKERHUB_IMAGE:latest
+    - apk add --no-cache git
-  - docker login -u "$CI_DOCKERHUB_USER" -p "$CI_DOCKERHUB_PASSWORD" $CI_DOCKERHUB_REGISTRY
+    - git config user.email "ci-bot@evanshome.io"
-  - docker push $CI_DOCKERHUB_IMAGE:$CI_COMMIT_REF_NAME $CI_DOCKERHUB_IMAGE:latest
+    - git config user.name "ci-bot"
-  
+    - npm install @semantic-release/gitlab@12.1.1 @semantic-release/changelog@6.0.3
-sast:
+      @semantic-release/git@10.0.1 conventional-changelog-eslint@5.0.0
-  stage: test
+    - npx semantic-release
-include:
+  artifacts:
-- template: Security/SAST.gitlab-ci.yml
+    paths:
+    - CHANGELOG.md

.releaserc.yml

@@ -0,0 +1,45 @@
+plugins:
+  - - "@semantic-release/commit-analyzer"
+    - preset: eslint
+      releaseRules:
+      - tag: Breaking
+        release: major
+      - tag: Build
+        release: patch
+      - tag: Chore
+        release: minor
+      - tag: Fix
+        release: patch
+      - tag: New
+        release: minor
+      - tag: Update
+        release: minor
+      - tag: Upgrade
+        release: minor
+  - - "@semantic-release/release-notes-generator"
+    - preset: eslint
+      releaseRules:
+      - tag: Breaking
+        release: major
+      - tag: Build
+        release: patch
+      - tag: Chore
+        release: minor
+      - tag: Fix
+        release: patch
+      - tag: New
+        release: minor
+      - tag: Update
+        release: minor
+      - tag: Upgrade
+        release: minor
+  - - "@semantic-release/changelog"
+    - changelogFile: CHANGELOG.md
+  - "@semantic-release/gitlab"
+  - - "@semantic-release/git"
+    - assets: CHANGELOG.md
+branches:
+  - "master"
+  - "+([0-9])?(.{+([0-9]),x}).x"
+  - name: "alpha"
+    prerelease: "alpha"

CHANGELOG.md

@@ -1,9 +1,75 @@
-# Changelog
+## [1.7.8](https://gitlab.evanshome.io/erichardson/py-eagle-mqtt/compare/v1.7.7...v1.7.8) (2023-12-03)
 
-All notable changes to this project will be documented in this file.
 
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+### ci
-and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+* 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)
+
+
+### Build
+
+* push all tags instead of just latest ([b143379](https://gitlab.evanrichardsonphotography.com/erichardson/py-eagle-mqtt/commit/b143379f2018f410677a9646234e7b483d9277d3))
+
+## [1.7.4](https://gitlab.evanrichardsonphotography.com/erichardson/py-eagle-mqtt/compare/v1.7.3...v1.7.4) (2021-05-09)
+
+
+### Build
+
+* cleanup long install line ([de1d073](https://gitlab.evanrichardsonphotography.com/erichardson/py-eagle-mqtt/commit/de1d073c6daf5d43fb7d9b7dafddd3b0cbcffc9b))
+
+### ci
+
+* Add git to node image ([6eb2d01](https://gitlab.evanrichardsonphotography.com/erichardson/py-eagle-mqtt/commit/6eb2d0145eff50c3243a364d821e769ae2ee06c9))
+* change semantic release image to alpine to save space, updated to node 16 ([b1ca049](https://gitlab.evanrichardsonphotography.com/erichardson/py-eagle-mqtt/commit/b1ca0497b0b51e0c50ca1e5f99e5c8abd4224d53))
+* Update DinD base to 20.10.6 and semantic release to node:15.  Also pin sonar-scanner-cli to 4.6 ([589fb4f](https://gitlab.evanrichardsonphotography.com/erichardson/py-eagle-mqtt/commit/589fb4fcf7841d3c5f08327d7fb5d5c107562ed6))
+
+## [1.7.3](https://gitlab.evanrichardsonphotography.com/erichardson/py-eagle-mqtt/compare/v1.7.2...v1.7.3) (2021-04-12)
+
+
+### Bug Fixes
+
+* Empty commit to get recent changes into build (last commit should've been labeled this) ([e513752](https://gitlab.evanrichardsonphotography.com/erichardson/py-eagle-mqtt/commit/e513752c46cc0b3beb93530f6549661d67196905))
+
+## [1.7.2](https://gitlab.evanrichardsonphotography.com/erichardson/py-eagle-mqtt/compare/v1.7.1...v1.7.2) (2021-04-08)
+
+
+### Bug Fixes
+
+* Cleanup CHANGELOG.md since using new semantic-release format ([a72ac7a](https://gitlab.evanrichardsonphotography.com/erichardson/py-eagle-mqtt/commit/a72ac7a1df91cb2231e38e8bbceb5ccf9c93328a))
+* fix asset info for git commit ([00c95c4](https://gitlab.evanrichardsonphotography.com/erichardson/py-eagle-mqtt/commit/00c95c42ea98921a1b2da9d2069d41e8e32f34f5))
+
+## [1.7.1](https://gitlab.evanrichardsonphotography.com/erichardson/py-eagle-mqtt/compare/v1.7.0...v1.7.1) (2021-04-08)
+
+
+### Bug Fixes
+
+* refactor Dockerfile to improve build ([40ac8c5](https://gitlab.evanrichardsonphotography.com/erichardson/py-eagle-mqtt/commit/40ac8c5ada9b993f53b72dcc14b2d9b7cd183e2f))
+
+## [1.6.10] - 2021-04-06
+
+### Fixed
+
+- Fix docker tagging issue
+
+## [1.6.9] - 2021-04-06
+
+### Fixed
+
+- Remove release-cli section of CI file
+- Add updated README.md
 
 ## [1.6.8] - 2021-04-06
 

Docker/Dockerfile

@@ -1,17 +1,26 @@
-FROM python:3.9.3-alpine3.12
+FROM python:3.11-alpine
-
 LABEL maintainer="Evan Richardson (evanrich81[at]gmail.com)"
-LABEL version="1.6.6"
+
+ARG BUILD_DATE
+ARG VCS_REF
+
+LABEL org.label-schema.schema-version="1.0"
+LABEL org.label-schema.build-date=$BUILD_DATE
+LABEL org.label-schema.name="evanrich/py-eagle-mqtt"
+LABEL org.label-schema.description="Python Rainforest Eagle to MQTT Application"
+LABEL org.label-schema.vcs-url="https://github.com/evanrich/py-eagle-mqtt"
+LABEL org.label-schema.vcs-ref=$VCS_REF
+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 . /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 rm -rf /var/cache/apk
+COPY . /app
-
 CMD ["/app/src/bin/tHome-eagle.py", "-c", "/app/src/conf"]
 
 EXPOSE 22042

Docker/requirements.txt

@@ -1,4 +1,3 @@
-astral==2.2
+paho-mqtt==1.6.1
-paho-mqtt==1.5.1
+bottle==0.12.25
-bottle==0.12.19
 defusedxml==0.7.1

README.md

@@ -1,22 +1,20 @@
 # py-eagle-mqtt
+
 Python3 based Docker for Eagle to MQTT reader
 
-I have only ported this into a dockerfile, All Original code (with one minor modification for XML root tag) is credit to [Ted Drain - TD22057](https://github.com/TD22057/T-Home).
+I have only ported this into a dockerfile, as well as made some changes to code for security or other purposes. All Original code is credit to [Ted Drain - TD22057](https://github.com/TD22057/T-Home).
+
+This project utilizes the following tools:
+
+[![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release)
+[![Libraries.io dependency status for GitHub repo](https://img.shields.io/librariesio/github/evanrich/py-eagle-mqtt)]()
+[![Gitlab pipeline status (self-hosted)](https://img.shields.io/gitlab/pipeline/erichardson/py-eagle-mqtt/master?gitlab_url=https%3A%2F%2Fgitlab.evanrichardsonphotography.com)]()
+[![Docker Pulls](https://img.shields.io/docker/pulls/evanrich/py-eagle-mqtt)]()
+[![Docker Image Version (latest by date)](https://img.shields.io/docker/v/evanrich/py-eagle-mqtt)]()
 
 ## UPDATES:
 
-2020-04-03: I've moved the repo to my private Gitlab server, with a mirror set up to github.  I did this so that I could easily integrate a CI/CD pipeline to build this image, as well as run some Security tools against the image to improve it's code quality.   Please continue to open bug reports/issues/pull requests here in Github.  Also swapped to defusedxml python module due to security issues around xmltree.  Forgot to incrememnt the build number, but docker container  latest is up-to-date.
+2020-04-06: Moved Updates to a CHANGELOG.md file to clean this up.
-   
-2019-07-24: Rebase to python 3.7.4-alpine3.10, update bottle to 0.12.17
-
-2019-04-12: Rebase to python 3.7.3-alpine3.9
-
-2019-03-08: Rebase to python 3.7.2-alpine3.9, update bottle and astral versions to latest
-
-2019-01-03: Rebase to python 3.7.2-alpine3.8, changed logging level to Info (should output to /var/log/tHome/eagle.log)
-
-2018-09-10: Ported to Python3, Added pricing info.  Merged into master branch
-
 
 ## Usage
 

renovate.json

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

sonar-project.properties

@@ -0,0 +1,3 @@
+sonar.projectKey=erichardson_py-eagle-mqtt_AXkgI9tRLcemhRz3NCjo
+sonar.qualitygate.wait=true
+sonar.projectBaseDir=Docker/src