Compare commits

...

92 Commits

Author SHA1 Message Date
semantic-release-bot
04dd0e76cb 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))
2023-12-03 04:55:54 +00:00
08069d61d1 Fix: semantic versioning and docker push to local registry 2023-12-03 04:48:47 +00:00
9ce6bb5798 ci: fix semantic versioning and docker push to local registry 2023-12-03 04:45:28 +00:00
2944dff3e2 Update .gitlab-ci.yml file 2023-12-03 04:27:41 +00:00
56384db94f Update .gitlab-ci.yml file 2023-12-03 03:50:06 +00:00
472b3b299c Update .gitlab-ci.yml file 2023-12-03 03:41:29 +00:00
83790754f7 update npm packages and node version to latest 2023-12-03 03:28:23 +00:00
5c1882a067 Add missing commit sha tag 2023-12-03 02:52:17 +00:00
18de343fc5 replace latest with sha 2023-12-03 02:50:53 +00:00
988f36194c Update .gitlab-ci.yml file 2023-12-03 01:32:15 +00:00
30b97f27f0 Update .gitlab-ci.yml file 2023-12-03 01:29:38 +00:00
e2e01ab72a Update .gitlab-ci.yml file 2023-12-03 01:28:37 +00:00
64806b5c57 Update .gitlab-ci.yml file 2023-10-07 05:42:34 +00:00
20b84aa56d Update .gitlab-ci.yml file 2023-10-07 05:06:29 +00:00
4041346e45 Update .gitlab-ci.yml file 2023-10-07 04:59:34 +00:00
db2a632c3b Update .gitlab-ci.yml file 2023-10-07 04:58:20 +00:00
48e17c1c1c Update .gitlab-ci.yml file 2023-10-07 04:48:55 +00:00
81683091a7 Update .gitlab-ci.yml file 2023-10-07 04:44:14 +00:00
7fee43ae4c Update .gitlab-ci.yml file 2023-10-07 04:42:27 +00:00
0ff6915de4 Update .gitlab-ci.yml file 2023-10-07 04:37:31 +00:00
eb89414dc4 Update .gitlab-ci.yml file 2023-10-07 04:29:51 +00:00
490d84d47a Update .gitlab-ci.yml file 2023-10-07 04:21:51 +00:00
8cc9a078b6 Update .gitlab-ci.yml file 2023-10-07 04:18:38 +00:00
4b9699a100 Update .gitlab-ci.yml file 2023-10-07 04:16:58 +00:00
ff03988c19 Update .gitlab-ci.yml file 2023-10-07 03:28:53 +00:00
49d843cf1e Update .gitlab-ci.yml file 2023-10-07 01:58:06 +00:00
716aa84792 Update .gitlab-ci.yml file 2023-10-07 01:56:16 +00:00
6e176eb3e1 Update .gitlab-ci.yml file 2023-10-07 01:26:31 +00:00
95ed67b399 Update .gitlab-ci.yml file 2023-10-07 01:24:38 +00:00
429ae78f77 Update .gitlab-ci.yml file 2023-10-06 23:09:41 +00:00
f2cc305dc1 Update .gitlab-ci.yml file 2023-10-06 08:03:46 +00:00
b8f66b8f6a Update .gitlab-ci.yml file 2023-10-06 08:01:08 +00:00
effa72b1dc Update .gitlab-ci.yml file 2023-10-06 07:56:17 +00:00
8116bb499d Update .gitlab-ci.yml file 2023-10-06 07:51:12 +00:00
4d721d8c3a Update .gitlab-ci.yml file 2023-10-06 07:31:20 +00:00
1d498866b5 revert to 23.0.3 2023-10-06 07:14:07 +00:00
916cf6c939 Merge branch 'renovate/docker-24.x' into 'master'
chore(deps): update docker docker tag to v24

See merge request erichardson/py-eagle-mqtt!29
2023-10-06 07:10:12 +00:00
a5450163d5 chore(deps): update docker docker tag to v24 2023-10-06 07:10:12 +00:00
0f16e4ffcc Merge branch 'renovate/docker-23.x' into 'master'
chore(deps): update docker docker tag to v23.0.6

See merge request erichardson/py-eagle-mqtt!28
2023-10-06 07:09:34 +00:00
Renovate Bot
89f7296f9f chore(deps): update docker docker tag to v23.0.6 2023-05-14 11:05:57 +00:00
1ce3e0ab47 Merge branch 'renovate/docker-23.x' into 'master'
chore(deps): update docker docker tag to v23.0.3

See merge request erichardson/py-eagle-mqtt!26
2023-04-10 06:11:30 +00:00
f1d9d9123f Merge branch 'renovate/bottle-0.x' into 'master'
chore(deps): update dependency bottle to v0.12.25

See merge request erichardson/py-eagle-mqtt!27
2023-04-10 06:11:21 +00:00
Renovate Bot
4f96d02e79 chore(deps): update docker docker tag to v23.0.3 2023-04-09 11:06:02 +00:00
Renovate Bot
0a9626cdfa chore(deps): update dependency bottle to v0.12.25 2023-03-05 12:06:07 +00:00
1af8a83a83 update semantic-release/gitlab and changelog to latest versions 2023-02-11 21:04:08 +00:00
af1af22cc4 Update docker to 23.0.0 2023-02-11 20:54:57 +00:00
703d89eeac Merge branch 'renovate/docker-23.x' into 'master'
chore(deps): update docker docker tag to v23

See merge request erichardson/py-eagle-mqtt!25
2023-02-11 20:53:51 +00:00
9c652b4c57 Merge branch 'master' into 'renovate/docker-23.x'
# Conflicts:
#   .gitlab-ci.yml
2023-02-11 20:50:10 +00:00
d95b0f3390 Merge branch 'renovate/docker-20.x' into 'master'
chore(deps): update docker docker tag to v20.10.23

See merge request erichardson/py-eagle-mqtt!24
2023-02-11 20:49:40 +00:00
Renovate Bot
9c8d437bd3 chore(deps): update docker docker tag to v23 2023-02-05 12:06:01 +00:00
Renovate Bot
0704476ee7 chore(deps): update docker docker tag to v20.10.23 2023-01-22 12:06:05 +00:00
be40ee48b3 Update .gitlab-ci.yml file to comment out sonarqube 2022-12-22 01:35:18 +00:00
521c18c6b3 Merge branch 'renovate/docker-20.x' into 'master'
chore(deps): update docker docker tag to v20.10.22

See merge request erichardson/py-eagle-mqtt!22
2022-12-21 07:11:34 +00:00
e9ec14eb2e Merge branch 'renovate/python-3.x' into 'master'
chore(deps): update python docker tag to v3.11

See merge request erichardson/py-eagle-mqtt!23
2022-12-21 07:11:19 +00:00
Renovate Bot
c52fc328c8 chore(deps): update docker docker tag to v20.10.22 2022-12-18 12:03:59 +00:00
Renovate Bot
c2f99cc99f chore(deps): update python docker tag to v3.11 2022-11-24 04:16:08 +00:00
6d71c0487d Merge branch 'renovate/docker-20.x' into 'master'
chore(deps): update docker docker tag to v20.10.20

See merge request erichardson/py-eagle-mqtt!18
2022-10-24 03:24:55 +00:00
37d35ca158 Merge branch 'renovate/node-19.x' into 'master'
chore(deps): update node.js to v19

See merge request erichardson/py-eagle-mqtt!19
2022-10-24 03:24:45 +00:00
Renovate Bot
e422a78734 chore(deps): update node.js to v19 2022-10-23 11:04:29 +00:00
Renovate Bot
288311b2ad chore(deps): update docker docker tag to v20.10.20 2022-10-23 11:04:26 +00:00
288d67b2ab Merge branch 'renovate/docker-20.x' into 'master'
chore(deps): update docker docker tag to v20.10.18

See merge request erichardson/py-eagle-mqtt!17
2022-09-14 16:03:00 +00:00
Renovate Bot
13006b80a3 chore(deps): update docker docker tag to v20.10.18 2022-09-14 15:52:55 +00:00
1c53fe26eb Merge branch 'erichardson-master-patch-86083' into 'master'
Update bottle to 0.12.23

See merge request erichardson/py-eagle-mqtt!16
2022-08-05 17:50:48 +00:00
9a0ff2fa07 Update bottle to 0.12.23 2022-08-05 17:48:26 +00:00
ee7a861f9d Switch to semantic commit messages for renovate 2022-06-10 17:35:47 +00:00
60a272a042 Merge branch 'renovate/docker-20.x' into 'master'
Update dependency docker to v20.10.17

See merge request erichardson/py-eagle-mqtt!15
2022-06-10 17:34:34 +00:00
Renovate Bot
90d2a2ce64 Update dependency docker to v20.10.17 2022-06-08 07:04:14 +00:00
fa5ba06f9c Merge branch 'renovate/bottle-0.x' into 'master'
Update dependency bottle to v0.12.21

See merge request erichardson/py-eagle-mqtt!14
2022-05-28 23:06:07 +00:00
Renovate Bot
0484e9ec6e Update dependency bottle to v0.12.21 2022-05-27 07:04:37 +00:00
89b3048d0e Merge branch 'renovate/node-18.x' into 'master'
Update Node.js to v18

See merge request erichardson/py-eagle-mqtt!12
2022-05-13 04:35:46 +00:00
6bcc6936f3 Merge branch 'renovate/docker-20.x' into 'master'
Update dependency docker to v20.10.16

See merge request erichardson/py-eagle-mqtt!13
2022-05-13 04:35:10 +00:00
Renovate Bot
3fd737651d Update dependency docker to v20.10.16 2022-05-12 20:42:42 +00:00
Renovate Bot
c4d6357154 Update Node.js to v18 2022-04-21 07:04:19 +00:00
b2c68b7624 Merge branch 'renovate/docker-20.x' into 'master'
Update dependency docker to v20.10.14

See merge request erichardson/py-eagle-mqtt!11
2022-04-10 17:15:40 +00:00
Renovate Bot
1e148cb395 Update dependency docker to v20.10.14 2022-04-05 18:34:16 +00:00
b810a58c8b Merge branch 'renovate/docker-20.x' into 'master'
Update dependency docker to v20.10.13

See merge request erichardson/py-eagle-mqtt!10
2022-03-14 23:16:00 +00:00
Renovate Bot
833e42f78b Update dependency docker to v20.10.13 2022-03-11 08:04:13 +00:00
8b31b70f00 Change to rootless dind image and pin versions of dependencies 2022-02-23 01:54:08 +00:00
c22f8003db Update Trivy command format 2022-02-23 01:33:45 +00:00
c919b5de36 Merge branch 'renovate/sonarsource-sonar-scanner-cli-4.x' into 'master'
Update dependency sonarsource/sonar-scanner-cli to v4.7

See merge request erichardson/py-eagle-mqtt!9
2022-02-22 22:38:49 +00:00
Renovate Bot
27e3a515d7 Update dependency sonarsource/sonar-scanner-cli to v4.7 2022-02-22 18:04:46 +00:00
d40e077dd1 Merge branch 'renovate/docker-20.x' into 'master'
Update docker Docker tag to v20.10.12

See merge request erichardson/py-eagle-mqtt!8
2021-12-14 07:35:31 +00:00
Renovate Bot
02d8b752d5 Update docker Docker tag to v20.10.12 2021-12-14 06:04:29 +00:00
0ab4fe1e6b Add PR labels 2021-12-03 06:42:33 +00:00
85eb35443f Merge branch 'renovate/docker-20.x' into 'master'
Update docker Docker tag to v20.10.11

See merge request erichardson/py-eagle-mqtt!7
2021-12-03 06:39:52 +00:00
Renovate Bot
02faa494bd Update docker Docker tag to v20.10.11 2021-12-03 06:05:06 +00:00
0aa5abf687 Merge branch 'erichardson-master-patch-11429' into 'master'
Deleted dependabot.yml

See merge request erichardson/py-eagle-mqtt!6
2021-12-03 05:46:46 +00:00
0d0d79f8e6 Deleted dependabot.yml 2021-12-03 05:45:15 +00:00
8d2db8617d Merge branch 'renovate/configure' into 'master'
Configure Renovate

See merge request erichardson/py-eagle-mqtt!5
2021-12-02 04:53:54 +00:00
Renovate User
259b759991 Add renovate.json 2021-12-02 04:48:56 +00:00
01d415b1ef Add dependabot config 2021-12-02 01:02:16 +00:00
418eea6f1a Update paho-mqtt to 1.6.1
Update Base image to 3.10 alpine python
update builder image to docker 20.10.10
2021-11-17 19:49:52 +00:00
5 changed files with 45 additions and 116 deletions

View File

@@ -4,76 +4,30 @@
# See https://docs.gitlab.com/ee/ci/variables/#priority-of-environment-variables
stages:
- test
#- test
- build
- push_local
#- push_local
- release
- push_dockerhub
.docker_base:
image: docker:20.10.6-dind
services:
- name: docker:20.10.6-dind
command: ["--tls=false"]
variables:
DOCKER_DRIVER: overlay2
DOCKER_HOST: tcp://127.0.0.1:2375/
DOCKER_TLS_CERTDIR: ""
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
#- push_dockerhub
build:
extends:
- .docker_base
image: docker:24.0.5-dind
stage: build
script:
- docker pull $CI_REGISTRY_IMAGE:latest || true
- >
docker build
--pull
--cache-from $CI_REGISTRY_IMAGE:latest
--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 push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
push local:
extends:
- .docker_base
stage: push_local
services:
- name: docker:24.0.5-dind
command: ["--tls=false"]
variables:
GIT_STRATEGY: none
only:
- master
DOCKER_DRIVER: overlay2
DOCKER_HOST: tcp://docker:2375
DOCKER_TLS_CERTDIR: ""
FF_GITLAB_REGISTRY_HELPER_IMAGE: 1
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 --all-tags
- 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 push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
release:
image: node:16-alpine3.13
image: node:20.10.0-alpine3.18
stage: release
only:
refs:
@@ -89,59 +43,11 @@ release:
script:
- touch CHANGELOG.md
- apk add --no-cache git
- npm install @semantic-release/gitlab @semantic-release/changelog
@semantic-release/git conventional-changelog-eslint
- git config user.email "ci-bot@evanshome.io"
- git config user.name "ci-bot"
- npm install @semantic-release/gitlab@12.1.1 @semantic-release/changelog@6.0.3
@semantic-release/git@10.0.1 conventional-changelog-eslint@5.0.0
- npx semantic-release
artifacts:
paths:
- CHANGELOG.md
sast:
stage: test
include:
- template: Security/SAST.gitlab-ci.yml
sonarqube-check:
stage: test
image:
name: sonarsource/sonar-scanner-cli:4.6
entrypoint: [""]
variables:
SONAR_USER_HOME: "${CI_PROJECT_DIR}/.sonar" # Defines the location of the analysis task cache
GIT_DEPTH: "0" # Tells git to fetch all the branches of the project, required by the analysis task
cache:
key: "${CI_JOB_NAME}"
paths:
- .sonar/cache
script:
- sonar-scanner
allow_failure: true
only:
- master # or the name of your main branch
- branches
trivy:
stage: test
extends:
- .docker_base
before_script:
- export TRIVY_VERSION=$(wget -qO - "https://api.github.com/repos/aquasecurity/trivy/releases/latest" | grep '"tag_name":' | sed -E 's/.*"v([^"]+)".*/\1/')
- echo $TRIVY_VERSION
- wget --no-verbose https://github.com/aquasecurity/trivy/releases/download/v${TRIVY_VERSION}/trivy_${TRIVY_VERSION}_Linux-64bit.tar.gz -O - | tar -zxvf -
allow_failure: true
script:
# Build image
- docker build -t $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA ./Docker/
# Build report
- ./trivy --exit-code 0 --cache-dir .trivycache/ --no-progress --format template --template "@contrib/gitlab.tpl" -o gl-container-scanning-report.json image $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
# Print report
- ./trivy --exit-code 0 --cache-dir .trivycache/ --no-progress --severity HIGH image $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
# Fail on severe vulnerabilities
- ./trivy --exit-code 1 --cache-dir .trivycache/ --severity CRITICAL --no-progress image $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
cache:
paths:
- .trivycache/
# Enables https://docs.gitlab.com/ee/user/application_security/container_scanning/ (Container Scanning report is available on GitLab EE Ultimate or GitLab.com Gold)
artifacts:
reports:
container_scanning: gl-container-scanning-report.json

View File

@@ -1,3 +1,14 @@
## [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](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)

View File

@@ -1,4 +1,4 @@
FROM python:3.9.6-alpine3.14
FROM python:3.11-alpine
LABEL maintainer="Evan Richardson (evanrich81[at]gmail.com)"
ARG BUILD_DATE

View File

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

12
renovate.json Normal file
View File

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