Compare commits

..

2 commits

Author SHA1 Message Date
d9e3522aa2 minor improvements
All checks were successful
continuous-integration/woodpecker the build was successful
2021-11-04 23:11:23 +01:00
6872d91892 minor improvements 2021-11-04 23:11:17 +01:00
3 changed files with 9 additions and 28 deletions

View file

@ -5,7 +5,9 @@ pipeline:
- DOCKER_USERNAME - DOCKER_USERNAME
- DOCKER_PASSWORD - DOCKER_PASSWORD
repo: spcodes/cadvisor repo: spcodes/cadvisor
tags: latest tags:
- v0.38.8
- latest
when: when:
branch: branch:
- main - main
@ -20,7 +22,9 @@ pipeline:
target: DOCKER_PASSWORD target: DOCKER_PASSWORD
registry: cr.sp-codes.de registry: cr.sp-codes.de
repo: cr.sp-codes.de/cadvisor repo: cr.sp-codes.de/cadvisor
tags: latest tags:
- v0.38.8
- latest
when: when:
branch: branch:
- main - main

View file

@ -13,11 +13,7 @@ RUN apk upgrade --no-cache \
# STEP 2 build the image including only the binary # STEP 2 build the image including only the binary
FROM alpine:3.14.2@sha256:e1c082e3d3c45cccac829840a25941e679c25d438cc8412c2fa221cf1a824e6a FROM alpine:3.14.2@sha256:e1c082e3d3c45cccac829840a25941e679c25d438cc8412c2fa221cf1a824e6a
RUN apk upgrade --no-cache && apk add \ RUN apk upgrade --no-cache && apk add libc6-compat device-mapper findutils zfs \
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/* && rm -rf /var/cache/apk/*
COPY --from=builder /go/src/github.com/google/cadvisor/cadvisor /usr/bin/cadvisor COPY --from=builder /go/src/github.com/google/cadvisor/cadvisor /usr/bin/cadvisor

View file

@ -11,26 +11,15 @@
{ {
"fileMatch": [ "fileMatch": [
"^Dockerfile$", "^Dockerfile$",
"^.drone.yml$" "^.woodpecker.yml$"
], ],
"matchStrings": [ "matchStrings": [
"\\s+ENV\\s*CADVISOR_VERSION=\"(?<currentValue>.*?)\"\\s+", "\\s+ENV\\s*CADVISOR_VERSION=\"(?<currentValue>.*?)\"\\s+",
"\\s+target:\\s*spcodes\\/cadvisor:(?<currentValue>.*?)\\s+" "\\s+repo:\\s*\\S*\\/cadvisor\\s+tags:[-\\s]+(?<currentValue>.*?)\\s+"
], ],
"versioningTemplate": "loose", "versioningTemplate": "loose",
"depNameTemplate": "google/cadvisor", "depNameTemplate": "google/cadvisor",
"datasourceTemplate": "github-releases" "datasourceTemplate": "github-releases"
},
{
"fileMatch": [
"^Dockerfile$"
],
"matchStrings": [
"\\s+(?<depName>[a-z0-9\\-]+?)=\"(?<currentValue>.*?)\""
],
"lookupNameTemplate": "alpine_3_14/{{{depName}}}",
"versioningTemplate": "loose",
"datasourceTemplate": "repology"
} }
], ],
"packageRules": [ "packageRules": [
@ -42,14 +31,6 @@
"cadvisor" "cadvisor"
] ]
}, },
{
"datasources": [
"repology"
],
"groupName": [
"base dependencies"
]
},
{ {
"datasources": [ "datasources": [
"docker" "docker"