Skip to content

Fix capitalization of Docker labels according to guidelines #389

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tielou wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix capitalization of Docker labels according to guidelines #389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions cleanup/cleanDockerImages/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions cleanup/cleanDockerImages/cleanDockerImages.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down