Added CHANGELOG
Refactored ci file
This commit is contained in:
@@ -28,7 +28,13 @@ build:
|
|||||||
- .docker_base
|
- .docker_base
|
||||||
stage: build
|
stage: build
|
||||||
script:
|
script:
|
||||||
- docker build --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA ./Docker/
|
- 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
|
- docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
|
||||||
|
|
||||||
push local:
|
push local:
|
||||||
@@ -44,6 +50,19 @@ push local:
|
|||||||
- docker tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA $CI_REGISTRY_IMAGE:latest
|
- docker tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA $CI_REGISTRY_IMAGE:latest
|
||||||
- docker push $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:
|
push dockerhub:
|
||||||
extends:
|
extends:
|
||||||
- .docker_base
|
- .docker_base
|
||||||
@@ -53,12 +72,12 @@ push dockerhub:
|
|||||||
CI_DOCKERHUB_IMAGE: index.docker.io/evanrich/py-eagle-mqtt
|
CI_DOCKERHUB_IMAGE: index.docker.io/evanrich/py-eagle-mqtt
|
||||||
CI_DOCKERHUB_REGISTRY: docker.io
|
CI_DOCKERHUB_REGISTRY: docker.io
|
||||||
only:
|
only:
|
||||||
- master
|
- tags
|
||||||
script:
|
script:
|
||||||
- docker pull $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
|
- docker pull $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
|
||||||
- docker tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA $CI_DOCKERHUB_IMAGE:latest
|
- docker tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA $CI_DOCKERHUB_IMAGE:$CI_COMMIT_REF_NAME $CI_DOCKERHUB_IMAGE:latest
|
||||||
- docker login -u "$CI_DOCKERHUB_USER" -p "$CI_DOCKERHUB_PASSWORD" $CI_DOCKERHUB_REGISTRY
|
- docker login -u "$CI_DOCKERHUB_USER" -p "$CI_DOCKERHUB_PASSWORD" $CI_DOCKERHUB_REGISTRY
|
||||||
- docker push $CI_DOCKERHUB_IMAGE:latest
|
- docker push $CI_DOCKERHUB_IMAGE:$CI_COMMIT_REF_NAME $CI_DOCKERHUB_IMAGE:latest
|
||||||
|
|
||||||
sast:
|
sast:
|
||||||
stage: test
|
stage: test
|
||||||
|
|||||||
41
CHANGELOG.md
Normal file
41
CHANGELOG.md
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
# 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.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
|
||||||
Reference in New Issue
Block a user