Compare commits

..

16 Commits
v1.7.0 ... dev

Author SHA1 Message Date
Evan Richardson
e513752c46 fix: Empty commit to get recent changes into build (last commit should've been labeled this) 2021-04-12 14:53:10 -07:00
evanrich
cfb392dc6a refactor: Add new docker labels to better identify container properties 2021-04-09 17:14:51 -07:00
f3f78c4ad5 docs: Fix badges formatting, also add docker version and # of pulls 2021-04-08 23:58:44 +00:00
d1723db798 docs: Add build status 2021-04-08 23:49:27 +00:00
ba8486017a docs: add dependency badge 2021-04-08 22:50:03 +00:00
37d8b17076 docs: add semantic-release badge 2021-04-08 22:29:53 +00:00
semantic-release-bot
da83d88229 chore(release): 1.7.2 [skip ci]
## [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](a72ac7a1df))
* fix asset info for git commit ([00c95c4](00c95c42ea))
2021-04-08 22:17:41 +00:00
evanrich
00c95c42ea fix: fix asset info for git commit 2021-04-08 15:16:21 -07:00
evanrich
a72ac7a1df fix: Cleanup CHANGELOG.md since using new semantic-release format
fix: Remove package-lock.json file (only commit CHANGELOG.md)
2021-04-08 15:11:32 -07:00
semantic-release-bot
ffbde1eff5 chore(release): 1.7.1 [skip ci]
## [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](40ac8c5ada))
2021-04-08 22:06:11 +00:00
1e58da7572 Merge branch 'dev' into 'master'
fix: refactor Dockerfile to improve build

See merge request erichardson/py-eagle-mqtt!2
2021-04-08 22:04:41 +00:00
evanrich
40ac8c5ada fix: refactor Dockerfile to improve build 2021-04-08 14:59:58 -07:00
evanrich
2c49af0f32 Merge branch 'master' of https://gitlab.evanrichardsonphotography.com/erichardson/py-eagle-mqtt 2021-04-08 14:47:21 -07:00
evanrich
a4c715068d Fix: Commit 3.9.4-alpine3.13 base change 2021-04-08 14:44:39 -07:00
91b6464e8c build: add missing npm install for git plugin 2021-04-08 21:34:14 +00:00
b9ad4e8ec1 build: add git plugin to sematic-release config file 2021-04-08 21:31:46 +00:00
5 changed files with 41 additions and 11 deletions

View File

@@ -35,6 +35,8 @@ build:
--pull --pull
--cache-from $CI_REGISTRY_IMAGE:latest --cache-from $CI_REGISTRY_IMAGE:latest
--tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA --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/
- docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
@@ -81,7 +83,7 @@ release:
- /^([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+[0-9A-Za-z-]+)?$/ - /^([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+[0-9A-Za-z-]+)?$/
script: script:
- touch CHANGELOG.md - touch CHANGELOG.md
- npm install @semantic-release/gitlab @semantic-release/changelog - npm install @semantic-release/gitlab @semantic-release/changelog @semantic-release/git
- npx semantic-release - npx semantic-release
artifacts: artifacts:
paths: paths:

View File

@@ -4,6 +4,8 @@ plugins:
- - "@semantic-release/changelog" - - "@semantic-release/changelog"
- changelogFile: CHANGELOG.md - changelogFile: CHANGELOG.md
- "@semantic-release/gitlab" - "@semantic-release/gitlab"
- - "@semantic-release/git"
- assets: CHANGELOG.md
branches: branches:
- "master" - "master"
- "+([0-9])?(.{+([0-9]),x}).x" - "+([0-9])?(.{+([0-9]),x}).x"

View File

@@ -1,9 +1,17 @@
# Changelog ## [1.7.2](https://gitlab.evanrichardsonphotography.com/erichardson/py-eagle-mqtt/compare/v1.7.1...v1.7.2) (2021-04-08)
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/), ### Bug Fixes
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
* 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 ## [1.6.10] - 2021-04-06

View File

@@ -1,17 +1,26 @@
FROM python:3.9.3-alpine3.12 FROM python:3.9.4-alpine3.13
LABEL maintainer="Evan Richardson (evanrich81[at]gmail.com)" 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 WORKDIR /app
COPY . /app COPY requirements.txt /app
COPY ./src/conf/logrotate/tHome /etc/logrotate.d/ COPY ./src/conf/logrotate/tHome /etc/logrotate.d/
ENV PYTHONPATH=/app/src/python ENV PYTHONPATH=/app/src/python
RUN apk --update add --no-cache logrotate \ RUN apk --update add --no-cache logrotate \
&& pip3 install --no-cache-dir --upgrade pip \ && pip3 install --no-cache-dir --upgrade pip \
&& pip3 install --no-cache-dir -r requirements.txt && 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"] CMD ["/app/src/bin/tHome-eagle.py", "-c", "/app/src/conf"]
EXPOSE 22042 EXPOSE 22042

View File

@@ -1,8 +1,17 @@
# py-eagle-mqtt # py-eagle-mqtt
Python3 based Docker for Eagle to MQTT reader Python3 based Docker for Eagle to MQTT reader
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). 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: ## UPDATES:
2020-04-06: Moved Updates to a CHANGELOG.md file to clean this up. 2020-04-06: Moved Updates to a CHANGELOG.md file to clean this up.