diff --git a/.woodpecker.yml b/.woodpecker.yml index 03e12d2..bfcd173 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -5,7 +5,9 @@ pipeline: - DOCKER_USERNAME - DOCKER_PASSWORD repo: spcodes/cadvisor - tags: latest + tags: + - v0.38.8 + - latest when: branch: - main @@ -20,7 +22,9 @@ pipeline: target: DOCKER_PASSWORD registry: cr.sp-codes.de repo: cr.sp-codes.de/cadvisor - tags: latest + tags: + - v0.38.8 + - latest when: branch: - main diff --git a/Dockerfile b/Dockerfile index 6643625..acc87dd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,11 +13,7 @@ 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="1.2.2-r3" \ - device-mapper="2.02.187-r1" \ - findutils="4.8.0-r1" \ - zfs="2.0.3-r1" \ +RUN apk upgrade --no-cache && apk add libc6-compat device-mapper findutils zfs \ && 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 a7b677e..99c2314 100644 --- a/renovate.json +++ b/renovate.json @@ -11,26 +11,15 @@ { "fileMatch": [ "^Dockerfile$", - "^.drone.yml$" + "^.woodpecker.yml$" ], "matchStrings": [ "\\s+ENV\\s*CADVISOR_VERSION=\"(?.*?)\"\\s+", - "\\s+target:\\s*spcodes\\/cadvisor:(?.*?)\\s+" + "\\s+repo:\\s*\\S*\\/cadvisor\\s+tags:[-\\s]+(?.*?)\\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": [ @@ -42,14 +31,6 @@ "cadvisor" ] }, - { - "datasources": [ - "repology" - ], - "groupName": [ - "base dependencies" - ] - }, { "datasources": [ "docker"