Skip to content
Snippets Groups Projects
Commit f63877ca authored by František Řezníček's avatar František Řezníček
Browse files

Merge branch 'docker-container-id-assert-fix' into 'master'

fix: container id assert expects /docker/ prefix

See merge request !3
parents f07b476e 16223ab0
No related branches found
No related tags found
1 merge request!3fix: container id assert expects /docker/ prefix
Pipeline #94537 passed
...@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ...@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased] ## [Unreleased]
## [1.0.4] - 2021-07-13
### Fixed
- dockermon id assert corrected, now expects `/docker/` prefix
## [1.0.3] - 2021-07-12 ## [1.0.3] - 2021-07-12
### Fixed ### Fixed
- compliance with cAdvisor: - compliance with cAdvisor:
......
...@@ -20,7 +20,7 @@ for i_container in ${CONTAINERS}; do ...@@ -20,7 +20,7 @@ for i_container in ${CONTAINERS}; do
i_container_id="/docker/$(echo "${i_container_status}" | jq -r '.[].Id')" i_container_id="/docker/$(echo "${i_container_status}" | jq -r '.[].Id')"
test -n "${i_container_name}" test -n "${i_container_name}"
echo -n "${i_container_restart_count}" | grep -Eq "^[0-9]+$" echo -n "${i_container_restart_count}" | grep -Eq "^[0-9]+$"
echo -n "${i_container_id}" | grep -Eq "^[a-fA-F0-9]{12,}$" echo -n "${i_container_id}" | grep -Eq "^/docker/[a-fA-F0-9]{12,}$"
CONTAINER_IDS+=("${i_container_id}") CONTAINER_IDS+=("${i_container_id}")
CONTAINER_NAMES+=("${i_container_name}") CONTAINER_NAMES+=("${i_container_name}")
CONTAINER_RESTART_COUNTS+=("${i_container_restart_count}") CONTAINER_RESTART_COUNTS+=("${i_container_restart_count}")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment