feat: remove astral again to try and fix semver (again?)

update CHANGELOG
remove extra section of CI file

.gitlab-ci.yml

@@ -1,36 +1,93 @@
-# This file is a template, and might need editing before it works on your project.
-# Official docker image.
-image: docker:latest
-
-services:
-  - docker:18.09-dind
+# You can override the included template(s) by including variable overrides
+# See https://docs.gitlab.com/ee/user/application_security/sast/#customizing-the-sast-settings
+# Note that environment variables can be set in several places
+# See https://docs.gitlab.com/ee/ci/variables/#priority-of-environment-variables
 
 stages:
-  - build
+- test
+- build
+- push_local
+- release
+- push_dockerhub
 
-variables:
-  DOCKER_HOST: tcp://localhost:2375
-  DOCKER_DRIVER: overlay2
-  #IMAGE_TAG: erichardson/py-eagle-mqtt:$CI_COMMIT_TAG
-  IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
-
-before_script:
+.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:
-  only:
-    - tags
+  extends:
+    - .docker_base
   stage: build
   script:
-    - docker build -t $IMAGE_TAG -t $CI_COMMIT_TAG ./Docker/
-    - docker push $IMAGE_TAG $CI_COMMIT_TAG
+  - docker pull $CI_REGISTRY_IMAGE:latest || true
+  - >
+    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
 
-#build:
-#  stage: build
-#  script:
-#    - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
-#    - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
-#  except:
-#    - master
+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
+  variables:
+    GIT_STRATEGY: none
+    CI_DOCKERHUB_IMAGE: index.docker.io/evanrich/py-eagle-mqtt
+    CI_DOCKERHUB_REGISTRY: docker.io
+  only:
+  - tags
+  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
+
+release:
+  image: node:13
+  stage: release
+  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-]+)?$/ 
+  script:
+    - touch CHANGELOG.md
+    - npm install @semantic-release/gitlab @semantic-release/changelog
+    - npx semantic-release
+  artifacts:
+    paths:
+    - CHANGELOG.md
+
+sast:
+  stage: test
+include:
+- template: Security/SAST.gitlab-ci.yml

.gitlab/sast-ruleset.toml

@@ -0,0 +1,6 @@
+[bandit]
+  [[bandit.ruleset]]
+    disable = true
+    [bandit.ruleset.identifier]
+      type = "bandit_test_id"
+      value = "B101"

.releaserc.yml

@@ -0,0 +1,11 @@
+plugins:
+  - "@semantic-release/commit-analyzer"
+  - "@semantic-release/release-notes-generator"
+  - - "@semantic-release/changelog"
+    - changelogFile: CHANGELOG.md
+  - "@semantic-release/gitlab"
+branches:
+  - "master"
+  - "+([0-9])?(.{+([0-9]),x}).x"
+  - name: "alpha"
+    prerelease: "alpha"

CHANGELOG.md

@@ -0,0 +1,60 @@
+# Changelog
+
+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/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [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
+
+### Changed
+
+- Fixed slight issue with tagging
+
+## [1.6.7] - 2021-04-06
+
+### Changed
+
+- Updated base image to Python 3.9.4-alpine3.13
+- Moved changes to this file
+
+### Removed
+
+- Changelog from README.md
+
+## [1.6.6] - 2021-04-03
+
+### Added
+
+- Added CI/CD pipeline to project
+
+### Changed
+
+- Moved project to my own personal Gitlab server for CI/CD pipelines as well as to run security scans on the container image and code
+
+- Updated base image to Python 3.9.3-alpine3.12
+
+## [Unversioned history]
+
+- 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

Docker/Dockerfile

@@ -1,7 +1,7 @@
-FROM python:3.7.4-alpine3.10
+FROM python:3.9.3-alpine3.12
 
 LABEL maintainer="Evan Richardson (evanrich81[at]gmail.com)"
-LABEL version="1.5.1"
+LABEL version="1.6.6"
 
 WORKDIR /app
 COPY . /app

Docker/requirements.txt

@@ -1,4 +1,3 @@
-astral==1.10.1
-paho-mqtt==1.4.0
-bottle==0.12.17
-
+paho-mqtt==1.5.1
+bottle==0.12.19
+defusedxml==0.7.1

Docker/src/conf/broker.py

@@ -18,7 +18,7 @@ keepAlive = os.getenv('KEEPALIVE', 60)
 #
 #===========================================================================
 user = os.getenv('MQTT_USER', None)
-password = os.getenv('MQTT_PASS', None)
+password = os.getenv('MQTT_PASSWORD', None)
 
 #===========================================================================
 #
@@ -31,5 +31,3 @@ ca_certs = [
 
 certFile = None
 keyFile = None
-
-

Docker/src/python/tHome/eagle/get.py

@@ -6,7 +6,7 @@ from . import messages as msg
 #from .InstantDemand import InstantDemand
 #from .Reading import Reading
 #from .Total import Total
-import xml.etree.ElementTree as ET
+import defusedxml.ElementTree as ET
 import socket
 
 #==========================================================================

Docker/src/python/tHome/eagle/parse.py

@@ -3,7 +3,7 @@
 # Parse XML messages into an object.
 #
 #===========================================================================
-import xml.etree.ElementTree as ET
+import defusedxml.ElementTree as ET
 from . import messages
 
 #==========================================================================

README.md

@@ -1,19 +1,11 @@
 # 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).
 
 ## UPDATES:
-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
 
+2020-04-06: Moved Updates to a CHANGELOG.md file to clean this up.
 
 ## Usage
 

k8s/deployment.yaml

@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: py-eagle-mqtt