artin/sourcegraph
1
0
Fork 0
mirror of https://github.com/sourcegraph/sourcegraph.git synced 2026-02-06 18:51:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Patch cadvisor (#35979)

Browse Source 
* Use amd64 image

* Update docs

* lint
This commit is contained in:
Andre Eleuterio 2022-05-25 11:17:42 -03:00 committed by GitHub
parent a2127a0a6c
commit bf98f92ec2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker-images/cadvisor/Dockerfile
View File

@ -1,5 +1,5 @@
FROM gcr.io/cadvisor/cadvisor:v0.42.0@sha256:f240a164f49ec49c5e633c1871c24e641e5dfdd8d2ea54aeb2f2b06d7e7cc980
LABEL com.sourcegraph.cadvisor.version=v0.42.0
FROM gcr.io/cadvisor/cadvisor@sha256:8938726fe00fd7a3889f7c4fb50a54b728f1d02fb5f6cbdbea604824ad11ff3f
LABEL com.sourcegraph.cadvisor.version=v0.44.0
ARG COMMIT_SHA="unknown"
ARG DATE="unknown"

28
docker-images/cadvisor/README.md
View File

@ -1,3 +1,31 @@
# Sourcegraph cAdvisor
Learn more about the Sourcegraph cAdvisor distribution in the [cAdvisor documentation](https://docs.sourcegraph.com/dev/background-information/observability/cadvisor).
## Updating the image
This image **is not** currently built by CI and errors that can break builds may go undetected. This is already under the attention of the dev-experience team.
The base images for cadvisor are hosted in gcr.io/cadvisor/cadvisor. Note that the images are not tagged by architecture. That needs to be verified manually:
1. Exec in the container with `docker run -it --entrypoint /bin/sh <image name>`
2. Run `uname -a` in the container
3. Ensure it's `x86_64` architecture.
For example:
```
docker run -it --entrypoint /bin/sh gcr.io/cadvisor/cadvisor@sha256:8938726fe00fd7a3889f7c4fb50a54b728f1d02fb5f6cbdbea604824ad11ff3f
Unable to find image 'gcr.io/cadvisor/cadvisor@sha256:8938726fe00fd7a3889f7c4fb50a54b728f1d02fb5f6cbdbea604824ad11ff3f' locally
gcr.io/cadvisor/cadvisor@sha256:8938726fe00fd7a3889f7c4fb50a54b728f1d02fb5f6cbdbea604824ad11ff3f: Pulling from cadvisor/cadvisor
df9b9388f04a: Already exists
32357bb75a40: Already exists
4f4fb700ef54: Already exists
a80659b3f11d: Already exists
769b92fe592c: Already exists
6ab71a81e6dc: Already exists
Digest: sha256:8938726fe00fd7a3889f7c4fb50a54b728f1d02fb5f6cbdbea604824ad11ff3f
Status: Downloaded newer image for gcr.io/cadvisor/cadvisor@sha256:8938726fe00fd7a3889f7c4fb50a54b728f1d02fb5f6cbdbea604824ad11ff3f
/ # uname -a
Linux c74b74199c86 5.10.104-linuxkit #1 SMP Thu Mar 17 17:08:06 UTC 2022 x86_64 Linux
```