Skip to content
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.

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

Docker: Upgrade to Alpine 3.11 #24056

Merged
merged 2 commits into from Apr 30, 2020
Merged

Docker: Upgrade to Alpine 3.11 #24056

merged 2 commits into from Apr 30, 2020

Conversation

aknuds1
Copy link
Contributor

@aknuds1 aknuds1 commented Apr 29, 2020

What this PR does / why we need it:
Upgrade our Docker images to base themselves on Alpine 3.11.

Which issue(s) this PR fixes:

Fixes #21920.

Special notes for your reviewer:
I also make sure to upgrade our base images to latest Go and Node v12.

I've scanned the image built from /Dockerfile, finding no vulnerabilities:

✗ trivy grafana/grafana:dev                                                
2020-04-30T09:25:20.048+0200	INFO	Detecting Alpine vulnerabilities...

grafana/grafana:dev (alpine 3.11.6)
===================================
Total: 0 (UNKNOWN: 0, LOW: 0, MEDIUM: 0, HIGH: 0, CRITICAL: 0)

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
Dockerfile Show resolved Hide resolved
@aknuds1 aknuds1 requested review from xlson, sakjur, a team and marefr and removed request for a team April 29, 2020 14:06
@aknuds1 aknuds1 added this to the 7.1 milestone Apr 29, 2020
@aknuds1 aknuds1 added this to Under review in Backend Platform Squad Apr 29, 2020
@aknuds1 aknuds1 requested a review from papagian April 29, 2020 14:10
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
Copy link
Contributor

@xlson xlson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

@aknuds1 aknuds1 merged commit dda8caf into master Apr 30, 2020
Backend Platform Squad automation moved this from Under review to Done Apr 30, 2020
@aknuds1 aknuds1 deleted the chore/alpine-3.11 branch April 30, 2020 11:42
aknuds1 added a commit that referenced this pull request Apr 30, 2020
* Docker: Upgrade to Alpine 3.11
@torkelo torkelo modified the milestones: 7.1, 7.0.0-beta3 May 7, 2020
@restlessankyyy
Copy link

Please add support to use curl for health checks in docker images .. we don't have this feature in base docker image. We need to go to grafana Ubuntu base image.

@aknuds1
Copy link
Contributor Author

aknuds1 commented May 11, 2020

@restlessankyyy care to make a feature request? That's a better way of bringing this issue to our attention.

@torkelo
Copy link
Member

torkelo commented Jun 5, 2020

@aknuds1 is the milestone wrong on this PR , maybe it was never cherry picked?

@marefr
Copy link
Member

marefr commented Jun 5, 2020

@torkelo the commit is in 7.0.3 tag.

@torkelo
Copy link
Member

torkelo commented Jun 6, 2020

Ok, great . Eldin was unsure if this made it into the release

@restlessankyyy
Copy link

Thanks I will check and see if it works.

aknuds1 added a commit that referenced this pull request Jun 30, 2020
* Docker: Upgrade to Alpine 3.11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

Docker: Update Alpine to 3.11
6 participants