diff --git a/.woodpecker.yml b/.woodpecker.yml index bfcd173..03e12d2 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -5,9 +5,7 @@ pipeline: - DOCKER_USERNAME - DOCKER_PASSWORD repo: spcodes/cadvisor - tags: - - v0.38.8 - - latest + tags: latest when: branch: - main @@ -22,9 +20,7 @@ pipeline: target: DOCKER_PASSWORD registry: cr.sp-codes.de repo: cr.sp-codes.de/cadvisor - tags: - - v0.38.8 - - latest + tags: latest when: branch: - main diff --git a/Dockerfile b/Dockerfile index acc87dd..6643625 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,11 @@ RUN apk upgrade --no-cache \ # STEP 2 build the image including only the binary FROM alpine:3.14.2@sha256:e1c082e3d3c45cccac829840a25941e679c25d438cc8412c2fa221cf1a824e6a -RUN apk upgrade --no-cache && apk add libc6-compat device-mapper findutils zfs \ +RUN apk upgrade --no-cache && apk add \ + libc6-compat="1.2.2-r3" \ + device-mapper="2.02.187-r1" \ + findutils="4.8.0-r1" \ + zfs="2.0.3-r1" \ && rm -rf /var/cache/apk/* COPY --from=builder /go/src/github.com/google/cadvisor/cadvisor /usr/bin/cadvisor diff --git a/renovate.json b/renovate.json index 99c2314..a7b677e 100644 --- a/renovate.json +++ b/renovate.json @@ -11,15 +11,26 @@ { "fileMatch": [ "^Dockerfile$", - "^.woodpecker.yml$" + "^.drone.yml$" ], "matchStrings": [ "\\s+ENV\\s*CADVISOR_VERSION=\"(?.*?)\"\\s+", - "\\s+repo:\\s*\\S*\\/cadvisor\\s+tags:[-\\s]+(?.*?)\\s+" + "\\s+target:\\s*spcodes\\/cadvisor:(?.*?)\\s+" ], "versioningTemplate": "loose", "depNameTemplate": "google/cadvisor", "datasourceTemplate": "github-releases" + }, + { + "fileMatch": [ + "^Dockerfile$" + ], + "matchStrings": [ + "\\s+(?[a-z0-9\\-]+?)=\"(?.*?)\"" + ], + "lookupNameTemplate": "alpine_3_14/{{{depName}}}", + "versioningTemplate": "loose", + "datasourceTemplate": "repology" } ], "packageRules": [ @@ -31,6 +42,14 @@ "cadvisor" ] }, + { + "datasources": [ + "repology" + ], + "groupName": [ + "base dependencies" + ] + }, { "datasources": [ "docker"