Skip to content

Commit

Permalink
Merge branch 'pip/deps' into 'master'
Browse files Browse the repository at this point in the history
Update prometheus_client to 0.11.0 and docker to 5.0.2

See merge request ix.ai/cioban!76
  • Loading branch information
tlex committed Sep 6, 2021
2 parents 4575936 + b5c07bb commit 7a03428
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
11 changes: 5 additions & 6 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,16 @@
# 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
---
variables:
DOCKERHUB_REPO_NAME: cioban
GITHUB_REPO_NAME: ix-ai/cioban
ENABLE_ARM64: 'true'
ENABLE_ARMv7: 'true'
ENABLE_ARMv6: 'true'
include:
- project: ix.ai/ci-templates
file: "/python-project.yml"
- template: Security/SAST.gitlab-ci.yml
- template: Dependency-Scanning.gitlab-ci.yml
- project: ix.ai/ci-templates
file: "/python-project.yml"
- template: Security/SAST.gitlab-ci.yml
- template: Dependency-Scanning.gitlab-ci.yml

sast:
stage: test
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,8 @@ Docker handles all the work of [applying rolling updates](https://docs.docker.co

## Tags and Arch

Starting with version 0.8.1, the images are multi-arch, with builds for amd64, arm64, armv7 and armv6.
Starting with version 0.8.1, the images are multi-arch, with builds for amd64, arm64.
Please note, `armv7` and `armv6` are no longer available starting with version 0.14.0, since the support for them was dropped in the upstream [docker:latest](https://hub.docker.com/_/docker) image.
* `vN.N.N` - for example 0.8.0
* `latest` - always pointing to the latest version
* `dev-master` - the last build on the master branch
Expand Down
4 changes: 2 additions & 2 deletions cioban/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
prometheus_client==0.10.0
docker==5.0.0
prometheus_client==0.11.0
docker==5.0.2
pause==0.3
pygelf==0.4.0
ix-notifiers==0.0.259196408

0 comments on commit 7a03428

Please sign in to comment.