From b58e73318d5000dfa7794194fe0182332ef7c6c2 Mon Sep 17 00:00:00 2001 From: Thilo Wobker Date: Tue, 29 Jun 2021 09:40:40 +0200 Subject: [PATCH] Fix capitalization of Docker labels according to guidelines --- cleanup/cleanDockerImages/README.md | 10 +++++----- cleanup/cleanDockerImages/cleanDockerImages.groovy | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cleanup/cleanDockerImages/README.md b/cleanup/cleanDockerImages/README.md index 48d93a48..88241cf0 100644 --- a/cleanup/cleanDockerImages/README.md +++ b/cleanup/cleanDockerImages/README.md @@ -24,17 +24,17 @@ Usage Cleanup policies are specified as labels on the Docker image. Currently, this plugin supports the following policies: -- `maxDays`: The maximum number of days a Docker image can exist in an +- `maxdays`: The maximum number of days a Docker image can exist in an Artifactory repository. Any images older than this will be deleted. -- `maxCount`: The maximum number of versions of a particular image which should - exist. For example, if there are 10 versions of a Docker image and `maxCount` +- `maxcount`: The maximum number of versions of a particular image which should + exist. For example, if there are 10 versions of a Docker image and `maxcount` is set to 6, the oldest 4 versions of the image will be deleted. To set these labels for an image, add them to the Dockerfile before building: ``` dockerfile -LABEL com.jfrog.artifactory.retention.maxCount="10" -LABEL com.jfrog.artifactory.retention.maxDays="7" +LABEL com.jfrog.artifactory.retention.maxcount="10" +LABEL com.jfrog.artifactory.retention.maxdays="7" ``` When a Docker image is deployed, Artifactory will automatically create diff --git a/cleanup/cleanDockerImages/cleanDockerImages.groovy b/cleanup/cleanDockerImages/cleanDockerImages.groovy index 500ae280..37038f4f 100644 --- a/cleanup/cleanDockerImages/cleanDockerImages.groovy +++ b/cleanup/cleanDockerImages/cleanDockerImages.groovy @@ -105,7 +105,7 @@ def simpleTraverse(parentInfo, oldSet, imagesPathMap, imagesCount) { // This method checks if the docker image's manifest has the property // "com.jfrog.artifactory.retention.maxDays" for purge def checkDaysPassedForDelete(item) { - def maxDaysProp = "docker.label.com.jfrog.artifactory.retention.maxDays" + def maxDaysProp = "docker.label.com.jfrog.artifactory.retention.maxdays" def oneday = TimeUnit.MILLISECONDS.convert(1, TimeUnit.DAYS) def prop = repositories.getProperty(item.repoPath, maxDaysProp) if (!prop) return false @@ -118,7 +118,7 @@ def checkDaysPassedForDelete(item) { // This method checks if the docker image's manifest has the property // "com.jfrog.artifactory.retention.maxCount" for purge def getMaxCountForDelete(item) { - def maxCountProp = "docker.label.com.jfrog.artifactory.retention.maxCount" + def maxCountProp = "docker.label.com.jfrog.artifactory.retention.maxcount" def prop = repositories.getProperty(item.repoPath, maxCountProp) if (!prop) return 0 log.debug "PROPERTY $maxCountProp FOUND = $prop IN MANIFEST FILE"