Build: Make distroless image default and publish mimir-alpine #8204
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ying-jeanne
force-pushed
the
make-distroless-default
branch
from
fe093a0
to
171b337
Compare
ying-jeanne
force-pushed
the
make-distroless-default
branch
from
171b337
to
836115e
Compare
ying-jeanne
changed the title
|
wait for support ticket to be implemented to create 3 repo in dockerhub |
ying-jeanne
force-pushed
the
make-distroless-default
branch
2 times, most recently
from
dee79e4
to
7f76fbc
Compare
|
the run for testing also alpine during deploy https://github.com/grafana/mimir/actions/runs/9290241970/job/25566956834 |
ying-jeanne
force-pushed
the
make-distroless-default
branch
2 times, most recently
from
a2c7154
to
fca8c2c
Compare
ying-jeanne
requested review from
wilfriedroset,
vaxvms,
bubu11e and
a team
as code owners
pstibrany
approved these changes
May 30, 2024
Makefile
Outdated
| fi; | ||
| @echo | ||
| # We need gcompat -- compatibility layer with glibc, as race-detector currently requires glibc, but Alpine uses musl libc instead. | ||
| $(SUDO) docker build --build-arg=revision=$(GIT_REVISION) --build-arg=goproxyValue=$(GOPROXY_VALUE) --build-arg=USE_BINARY_SUFFIX=true --build-arg=BINARY_SUFFIX=_race --build-arg=EXTRA_PACKAGES="gcompat" -t $(IMAGE_PREFIX)$(shell basename $(@D)):$(IMAGE_TAG_RACE) $(@D)/ | ||
| # for grafana/mimir which is based on distroless image, the EXTRA_PACKAGES is just ignored. |
There was a problem hiding this comment.
Why do we even pass EXTRA_PACKAGES to the build then? We can remove it.
There was a problem hiding this comment.
I did a search in project, this is used in other dockerfiles still, not only for cmd/mimir, we still need it.
There was a problem hiding this comment.
I see what you mean now, it is UPTODATE_RACE target which is only for cmd/mimir, removing it.
Co-authored-by: Peter Štibraný <pstibrany@gmail.com>
pstibrany
reviewed
May 31, 2024
| --build-arg=BASEIMG="gcr.io/distroless/base-nossl-debian12" \ | ||
| -t $(IMAGE_PREFIX)$(shell basename $(@D))-distroless:$(IMAGE_TAG_RACE) $(@D)/; \ | ||
| --build-arg=EXTRA_PACKAGES="gcompat" \ | ||
| -t $(IMAGE_PREFIX)$(shell basename $(@D))-alpine:$(IMAGE_TAG_RACE) $(@D)/; \ | ||
| fi; | ||
| @echo | ||
| # We need gcompat -- compatibility layer with glibc, as race-detector currently requires glibc, but Alpine uses musl libc instead. |
There was a problem hiding this comment.
This comment should be moved to "alpine" version. For distroless image, we should restore comment about using distroless/base-nossl-debian12 as base image.
narqo
pushed a commit
to narqo/grafana-mimir
that referenced
this pull request
Jun 6, 2024
…a#8204) * Security: Make distroless image default and publish mimir-alpine * Update CHANGELOG.md * Update CHANGELOG.md Co-authored-by: Peter Štibraný <pstibrany@gmail.com> * remove extra_package for distroless uptodate_race target --------- Co-authored-by: Peter Štibraný <pstibrany@gmail.com>
simonswine
added a commit
to simonswine/pyroscope
that referenced
this pull request
Jul 22, 2024
Following a trend by at other database teams: * grafana/loki#13325 * grafana/mimir#8204
simonswine
added a commit
to simonswine/pyroscope
that referenced
this pull request
Jul 22, 2024
Following a trend by at other database teams: * grafana/loki#13325 * grafana/mimir#8204
simonswine
added a commit
to grafana/pyroscope
that referenced
this pull request
Jul 23, 2024
* chore: Replace alpine with distroless Following a trend by at other database teams: * grafana/loki#13325 * grafana/mimir#8204 * Also build debug image for main
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does
Which issue(s) this PR fixes or relates to
Make distroless the default base image for grafana/mimir. To minimize the change, i just switched dockerfiles and changed makefile, pipeline stayed mostly untouched.
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX].about-versioning.mdupdated with experimental features.