chore(packaging/docker): Support multiple architectures #762

sh0rez · 2019-07-16T10:54:29Z

✔️ Ready to be merged ✔️

This is take 2 on multiple architectures. It includes the following:

clean loki-build-image that is based on golang:1.11.4-alpine
Dockerfile for promtail that is capable of being built for multiple architectures, based on alpine
Dockerfile for loki that is capable of being built for multiple architectures, based on alpine
Makefile adaptations that allow building the Dockerfiles as cross-platform, but only when run in CI
- set CI=true to trigger the cross-platform run
- uses img instead of docker under the hood, because of better support for --platform.
Adapt CircleCI to build and push the images for loki and promtail for amd64, arm64 and armv7
- install img and binfmt-support
- use it

Notes

BuildKit

One might have noticed that Docker has introduced a new architecture for building OCI container images called BuildKit. It comes with a lot of improvements over the traditional docker build including a DAG-Solver (builds only what's required, parallelizes as much as possible), better caching, frontends (not only Dockerfile, dynamic syntax extensions) and especially cross-platform support using --platform. As long as the host is capable of executing the ELF binaries, BuildKit can build every arch

`binfmt`

A Linux kernel feature that allows the kernel to dynamically recognize what to use to execute an ELF binary. This is especially useful with buildkit and qemu. By running sudo docker run --privileged linuxkit/binfmt:v0.6, qemu-static-ARCH executors are registered with the kernel and suddenly it is possible to execute a armhf/ arm64 / whatever binary as if it was native.

`img`

Although buildkit is usable as a standalone daemon, it is a really handy library as well. The awesome folks over at https://github.com/genuinetools/img used this to build a daemonless cli that builds Dockerfiles using buildkit without root privileges. Because it is still BuildKit, we get all the awesome features above include --platform.

Although BuildKit is going to be fully integrated into Docker Engine in 19.03, it will still be experimental, so it is easier for the moment to use it standalone.

Cleans the grafana/loki-build-image container image, removes unnecessary parts and modularizes it. Switches to alpine for performance and compatibility reasons

Adds multiarch support to the docker build process: - make Dockerfiles multiarch compatible - make Makefile aware (build using `img` in ci, cross-build)

Re-adds docker-cli to loki-build-image, to support TCP daemons

sh0rez · 2019-07-30T11:00:52Z

Okay, this finally comes to an an end here.

Please take a look @slim-bean @cyriltovena @rfratto, thanks :)

rfratto

nice job! my only big concerns are two things:

the regression with systemd headers being removed from the build image due to the switch to alpine
shouldn't circle CI have picked up the new config.yml and ran some kind of tests against the PR?

loki-build-image/Dockerfile

cmd/docker-driver/Dockerfile

Makefile

rfratto · 2019-07-30T14:20:58Z

If the minimum required version of Docker for building locally changed, it'd be nice to see one of the documents (maybe this one) updated to specify how to build w/ Docker and which version one needs.

I wouldn't be surprised if a good amount of people are running macOS so using img directly for building is out of the question

cmd/loki/Dockerfile

cmd/promtail/Dockerfile

loki-build-image/Dockerfile

cmd/promtail/Dockerfile

slim-bean · 2019-07-31T01:22:57Z

Wondering if it's possible to centralize the build-image version since we use it in half a dozen docker files and the makefile now, updating it in that many places is certainly prone to error

slim-bean · 2019-07-31T01:45:03Z

Nice work on this @sh0rez there are a lot of details to keep track of here and this is very good, almost there!

sh0rez · 2019-07-31T08:29:13Z

Wondering if it's possible to centralize the build-image version since we use it in half a dozen docker files and the makefile now, updating it in that many places is certainly prone to error

Yeah, done that using build-args and the makefile

Required for systemd headers

Contrary to what has been done before, this reverts to something close to the old behavior: If a git tag is built, the name of the tag is used as the docker tag. If the master branch is built, it is tagged as master-SHA, master and latest If a regular branch is built, it is not pushed.

slim-bean

I think we got it, LGTM!

addressed

sh0rez changed the title ~~feat(build): Support multiple architectures~~ WIP feat(build): Support multiple architectures Jul 16, 2019

sh0rez mentioned this pull request Jul 17, 2019

feat: split Dockerfile #754

Closed

sh0rez force-pushed the multiarch-docker branch 2 times, most recently from a3256f3 to 79ad067 Compare July 29, 2019 14:28

sh0rez self-assigned this Jul 30, 2019

sh0rez added component/packaging type/enhancement Something existing could be improved labels Jul 30, 2019

sh0rez added 5 commits July 30, 2019 08:51

refactor(build): clean loki-build-image

3e13c65

Cleans the grafana/loki-build-image container image, removes unnecessary parts and modularizes it. Switches to alpine for performance and compatibility reasons

feat(build): multiarch docker images

822cf49

Adds multiarch support to the docker build process: - make Dockerfiles multiarch compatible - make Makefile aware (build using `img` in ci, cross-build)

fix(build-image): docker-cli

dcd8708

Re-adds docker-cli to loki-build-image, to support TCP daemons

fix(ci): adapt to multi-arch

30ab8da

feat(ci): publish

922f6bc

sh0rez force-pushed the multiarch-docker branch from 71162e7 to 922f6bc Compare July 30, 2019 06:52

sh0rez added 2 commits July 30, 2019 08:58

feat(ci): loki-canary

4208f30

fix(ci): re-enable helm

da8b322

sh0rez force-pushed the multiarch-docker branch from ee1affa to da8b322 Compare July 30, 2019 07:01

fix(ci): loki-canary cross platform

2cebc49

sh0rez force-pushed the multiarch-docker branch 3 times, most recently from 9ee62d7 to 011e3dc Compare July 30, 2019 10:40

fix(ci): re-add loki-docker-driver

6d2e7cb

sh0rez force-pushed the multiarch-docker branch from 011e3dc to 6d2e7cb Compare July 30, 2019 10:47

fix(ci): s/shorez/grafana/g

272c448

sh0rez requested review from slim-bean, rfratto and cyriltovena July 30, 2019 10:56

rfratto mentioned this pull request Jul 30, 2019

Makefile: build promtail with CGO_ENABLED if GOHOSTOS=GOOS=linux #809

Merged

rfratto previously requested changes Jul 30, 2019

View reviewed changes

loki-build-image/Dockerfile Outdated Show resolved Hide resolved

loki-build-image/Dockerfile Outdated Show resolved Hide resolved

cmd/docker-driver/Dockerfile Outdated Show resolved Hide resolved

Makefile Show resolved Hide resolved

slim-bean reviewed Jul 31, 2019

View reviewed changes

cmd/loki/Dockerfile Outdated Show resolved Hide resolved

slim-bean reviewed Jul 31, 2019

View reviewed changes

cmd/promtail/Dockerfile Outdated Show resolved Hide resolved

slim-bean reviewed Jul 31, 2019

View reviewed changes

loki-build-image/Dockerfile Show resolved Hide resolved

slim-bean reviewed Jul 31, 2019

View reviewed changes

cmd/promtail/Dockerfile Outdated Show resolved Hide resolved

sh0rez changed the title ~~WIP feat(build): Support multiple architectures~~ feat(build): Support multiple architectures Jul 31, 2019

sh0rez added 3 commits July 31, 2019 10:14

fix(promtail): add tzdata to docker image

1417330

feat(packaging): pin build image

8f9603c

fix(ci): do not test in container

5c33d03

sh0rez added 5 commits July 31, 2019 10:30

chore: re-enable loki-build-image entrypoint

5347616

chore(packaging): fix style inconsistency

41fb0b6

chore(ci): promtail windows

1128664

chore(packaging): move loki-build-image back to debian

9b09d60

Required for systemd headers

chore(packaging/makefile): use version and prefix for build-image

c82710f

sh0rez requested review from slim-bean and rfratto and removed request for slim-bean July 31, 2019 10:39

sh0rez changed the title ~~feat(build): Support multiple architectures~~ chore(packaging/docker): Support multiple architectures Jul 31, 2019

sh0rez force-pushed the multiarch-docker branch from 75101e9 to 20f4ce8 Compare August 1, 2019 08:46

sh0rez added 3 commits August 1, 2019 13:55

chore(packaging): docker tag with WIP on dirty branch

6866aba

chore(packaging): finishing touch

7ddc1e1

chore(packaging): bump loki-build-image to 0.3.0

9df81cd

slim-bean approved these changes Aug 1, 2019

View reviewed changes

sh0rez merged commit b887602 into grafana:master Aug 1, 2019

sh0rez deleted the multiarch-docker branch August 1, 2019 14:08

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore(packaging/docker): Support multiple architectures #762

chore(packaging/docker): Support multiple architectures #762

sh0rez commented Jul 16, 2019 •

edited

Loading

sh0rez commented Jul 30, 2019 •

edited

Loading

rfratto left a comment

rfratto commented Jul 30, 2019 •

edited

Loading

slim-bean commented Jul 31, 2019

slim-bean commented Jul 31, 2019

sh0rez commented Jul 31, 2019

slim-bean left a comment

chore(packaging/docker): Support multiple architectures #762

chore(packaging/docker): Support multiple architectures #762

Conversation

sh0rez commented Jul 16, 2019 • edited Loading

✔️ Ready to be merged ✔️

Notes

BuildKit

binfmt

img

sh0rez commented Jul 30, 2019 • edited Loading

rfratto left a comment

Choose a reason for hiding this comment

rfratto commented Jul 30, 2019 • edited Loading

slim-bean commented Jul 31, 2019

slim-bean commented Jul 31, 2019

sh0rez commented Jul 31, 2019

slim-bean left a comment

Choose a reason for hiding this comment

sh0rez commented Jul 16, 2019 •

edited

Loading

`binfmt`

`img`

sh0rez commented Jul 30, 2019 •

edited

Loading

rfratto commented Jul 30, 2019 •

edited

Loading