Use buildx for multiarch docker builds #836

LucasRoesler · 2020-10-25T20:03:39Z

Description

Refactor the Makefile and build scripts to consolidate the multiarch
builds into a single docker file by using docker buildx. This mimics
the changes from inlets/inlets#204.
The redist script has been removed and the makefile now contains the
equivalent commands.
The build command now calls buildx twice, to get the root and rootless
image.
Add a new constant shortPlatform so that we can map the TARGETPLATFORM
value that is exposed by buildx so the required value used by the template store.

Motivation and Context

I have raised an issue to propose this change (required)

How Has This Been Tested?

Wait and see how travis feels

Types of changes

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

My code follows the code style of this project.
My change requires a change to the documentation.
I have updated the documentation accordingly.
I've read the CONTRIBUTION guide
I have signed-off my commits with git commit -s
I have added tests to cover my changes.
All new and existing tests passed.

alexellis · 2020-10-25T20:11:53Z

.travis.yml

 services:
 - docker

 before_script:
- curl -sSLf https://get.docker.com | sed s/sleep\ 20/sleep\ 0/g | sudo -E sh
+  - sudo rm -rf /var/lib/apt/lists/*


See how I extracted this into a shell script. I think it may be easier to maintain that way.

https://github.com/teamserverless/license-check/blob/master/.travis.yml#L14

alexellis · 2020-10-25T20:12:23Z

.travis.yml

-        docker push quay.io/$DOCKER_NS/faas-cli:latest-root;
+  - make docker-login
+  - make docker-login-ghcr
+  - if [ ! -z "$TRAVIS_TAG" ] ; then


We shouldn't need this, or it can move to the Makefile

See how I did it for inlets/inlets

i wasn't sure what you wanted to do with the quey stuff, so i left it alone

Sure. Can we do it like the inlets/inlets repo?

Basically build again with another tag, it just uses the cache.

Let's switch to GHCR for this repo from Quay.io, I just checked that nobody has downloaded it from there all year.

(FYI I've added GHCR credentials and I've deleted the Quay.io repo for faas-cli)

alexellis · 2020-10-25T20:13:21Z

Dockerfile

@@ -1,14 +1,23 @@
 FROM teamserverless/license-check:0.3.6 as license-check


Can you bump to 0.3.9?

alexellis · 2020-10-25T20:13:48Z

Dockerfile

-RUN VERSION=$(git describe --all --exact-match `git rev-parse HEAD` | grep tags | sed 's/tags\///') \
-    && GIT_COMMIT=$(git rev-list -1 HEAD) \
-    && CGO_ENABLED=0 GOOS=linux go build --ldflags "-s -w \
+RUN GOOS=${TARGETOS} GOARCH=${TARGETARCH} CGO_ENABLED=0 \


Do we need -mod=vendor here?

it is set via ENV GOFLAGS=-mod=vendor

@LucasRoesler

The Quay image had no recent pulls, unlike the Docker Hub image in #836 @LucasRoesler is also adding GHCR. Signed-off-by: Alex Ellis (OpenFaaS Ltd) <alexellis2@gmail.com>

alexellis

Sending comments over

alexellis · 2020-10-25T20:19:16Z

.travis.yml

-        docker push quay.io/$DOCKER_NS/faas-cli:latest-root;
+  - make docker-login
+  - make docker-login-ghcr
+  - if [ ! -z "$TRAVIS_TAG" ] ; then


Sure. Can we do it like the inlets/inlets repo?

Basically build again with another tag, it just uses the cache.

Let's switch to GHCR for this repo from Quay.io, I just checked that nobody has downloaded it from there all year.

alexellis · 2020-10-25T20:23:52Z

.travis.yml

-        docker push quay.io/$DOCKER_NS/faas-cli:latest-root;
+  - make docker-login
+  - make docker-login-ghcr
+  - if [ ! -z "$TRAVIS_TAG" ] ; then


(FYI I've added GHCR credentials and I've deleted the Quay.io repo for faas-cli)

alexellis · 2020-10-30T09:06:05Z

Makefile

+		--output "$(.BUILDX_OUTPUT)" \
+		--target root \
+		--tag openfaas/faas-cli:latest-root \
+		--tag openfaas/faas-cli:$(.GIT_VERSION)-root .

 .PHONY: build_redist
 build_redist:


Previously we had a build that might have run 2x as fast because we built in Docker, then pulled out the binaries.

How that we are both building in Docker, and on the host, how does the performance compare?

Should we adapt the Docker builds to pull in these binaries peharps?

I just copied the flow from inlets, i figured you preferred that

What is the timing difference?

i'll just revert. I don't know the timing difference because i haven't gotten a successful build. My goal was consistency between projects to reduce the maintenance effort. But I don't have strong feelings here.

I hav reverted that change

Using buildx results in build time: 8 min 51 sec
The last master build was : 4 min 46 sec

alexellis · 2020-10-30T09:14:48Z

build golang.org/x/sys/internal/unsafeheader: cannot find module for path golang.org/x/sys/internal/unsafeheader
933

Can you take a look at the error please?

**What** - Refactor the Makefile and build scripts to consolidate the multiarch builds into a single docker file by using `docker buildx`. This mimics the changes from inlets/inlets#204. - The redist script has been removed and the makefile now contains the equivalent commands. - The build command now calls buildx twice, to get the root and rootless image. Signed-off-by: Lucas Roesler <roesler.lucas@gmail.com>

Fixes openfaas#838 Thanks to Lucas Roesler for his PR for buildx support openfaas#836 Signed-off-by: Utsav Anand <utsavanand2@gmail.com>

Fixes #838 Thanks to Lucas Roesler for his PR for buildx support #836 Signed-off-by: Utsav Anand <utsavanand2@gmail.com>

alexellis · 2020-11-17T14:47:51Z

I've merged the newer PR from Utsav. Thank you for showing the way with this.

LucasRoesler requested a review from alexellis October 25, 2020 20:03

LucasRoesler force-pushed the simplify-multiarch-builds-with-buildx branch from ee48c66 to 09ba934 Compare October 25, 2020 20:08

alexellis reviewed Oct 25, 2020

View reviewed changes

Dockerfile Outdated

@@ -1,14 +1,23 @@

FROM teamserverless/license-check:0.3.6 as license-check

Copy link

Member

alexellis Oct 25, 2020

Choose a reason for hiding this comment

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

Can you bump to 0.3.9?

alexellis reviewed Oct 25, 2020

View reviewed changes

LucasRoesler force-pushed the simplify-multiarch-builds-with-buildx branch 2 times, most recently from 0cc46e1 to cf15793 Compare October 25, 2020 20:17

alexellis added a commit that referenced this pull request Oct 25, 2020

Remove quay.io

03738d2

The Quay image had no recent pulls, unlike the Docker Hub image in #836 @LucasRoesler is also adding GHCR. Signed-off-by: Alex Ellis (OpenFaaS Ltd) <alexellis2@gmail.com>

alexellis reviewed Oct 25, 2020

View reviewed changes

LucasRoesler force-pushed the simplify-multiarch-builds-with-buildx branch 4 times, most recently from a20d10b to b7ccf42 Compare October 25, 2020 21:28

alexellis reviewed Oct 30, 2020

View reviewed changes

LucasRoesler force-pushed the simplify-multiarch-builds-with-buildx branch from b7ccf42 to b4bb0e8 Compare October 30, 2020 09:48

utsavanand2 added a commit to utsavanand2/faas-cli that referenced this pull request Nov 6, 2020

Migrate builds from Travis to Github Actions

f64ae5b

Fixes openfaas#838 Thanks to Lucas Roesler for his PR for buildx support openfaas#836 Signed-off-by: Utsav Anand <utsavanand2@gmail.com>

utsavanand2 added a commit to utsavanand2/faas-cli that referenced this pull request Nov 6, 2020

Migrate builds from Travis to Github Actions

daf195e

Fixes openfaas#838 Thanks to Lucas Roesler for his PR for buildx support openfaas#836 Signed-off-by: Utsav Anand <utsavanand2@gmail.com>

utsavanand2 mentioned this pull request Nov 6, 2020

Migrate builds from Travis to Github Actions #839

Merged

11 tasks

utsavanand2 added a commit to utsavanand2/faas-cli that referenced this pull request Nov 8, 2020

Migrate builds from Travis to Github Actions

8303f7e

Fixes openfaas#838 Thanks to Lucas Roesler for his PR for buildx support openfaas#836 Signed-off-by: Utsav Anand <utsavanand2@gmail.com>

utsavanand2 added a commit to utsavanand2/faas-cli that referenced this pull request Nov 8, 2020

Migrate builds from Travis to Github Actions

712bee1

Fixes openfaas#838 Thanks to Lucas Roesler for his PR for buildx support openfaas#836 Signed-off-by: Utsav Anand <utsavanand2@gmail.com>

utsavanand2 added a commit to utsavanand2/faas-cli that referenced this pull request Nov 8, 2020

Migrate builds from Travis to Github Actions

d006daa

Fixes openfaas#838 Thanks to Lucas Roesler for his PR for buildx support openfaas#836 Signed-off-by: Utsav Anand <utsavanand2@gmail.com>

utsavanand2 added a commit to utsavanand2/faas-cli that referenced this pull request Nov 8, 2020

Migrate builds from Travis to Github Actions

72ce897

Fixes openfaas#838 Thanks to Lucas Roesler for his PR for buildx support openfaas#836 Signed-off-by: Utsav Anand <utsavanand2@gmail.com>

utsavanand2 added a commit to utsavanand2/faas-cli that referenced this pull request Nov 8, 2020

Migrate builds from Travis to Github Actions

3e2d7e9

Fixes openfaas#838 Thanks to Lucas Roesler for his PR for buildx support openfaas#836 Signed-off-by: Utsav Anand <utsavanand2@gmail.com>

utsavanand2 added a commit to utsavanand2/faas-cli that referenced this pull request Nov 8, 2020

Migrate builds from Travis to Github Actions

b685d05

Fixes openfaas#838 Thanks to Lucas Roesler for his PR for buildx support openfaas#836 Signed-off-by: Utsav Anand <utsavanand2@gmail.com>

utsavanand2 added a commit to utsavanand2/faas-cli that referenced this pull request Nov 11, 2020

Migrate builds from Travis to Github Actions

f099bed

Fixes openfaas#838 Thanks to Lucas Roesler for his PR for buildx support openfaas#836 Signed-off-by: Utsav Anand <utsavanand2@gmail.com>

utsavanand2 added a commit to utsavanand2/faas-cli that referenced this pull request Nov 11, 2020

Migrate builds from Travis to Github Actions

197fa48

Fixes openfaas#838 Thanks to Lucas Roesler for his PR for buildx support openfaas#836 Signed-off-by: Utsav Anand <utsavanand2@gmail.com>

utsavanand2 added a commit to utsavanand2/faas-cli that referenced this pull request Nov 11, 2020

Migrate builds from Travis to Github Actions

91ae0dd

Fixes openfaas#838 Thanks to Lucas Roesler for his PR for buildx support openfaas#836 Signed-off-by: Utsav Anand <utsavanand2@gmail.com>

utsavanand2 added a commit to utsavanand2/faas-cli that referenced this pull request Nov 11, 2020

Migrate builds from Travis to Github Actions

4cd1efd

Fixes openfaas#838 Thanks to Lucas Roesler for his PR for buildx support openfaas#836 Signed-off-by: Utsav Anand <utsavanand2@gmail.com>

utsavanand2 added a commit to utsavanand2/faas-cli that referenced this pull request Nov 11, 2020

Migrate builds from Travis to Github Actions

1074f36

Fixes openfaas#838 Thanks to Lucas Roesler for his PR for buildx support openfaas#836 Signed-off-by: Utsav Anand <utsavanand2@gmail.com>

utsavanand2 added a commit to utsavanand2/faas-cli that referenced this pull request Nov 11, 2020

Migrate builds from Travis to Github Actions

87f9b74

Fixes openfaas#838 Thanks to Lucas Roesler for his PR for buildx support openfaas#836 Signed-off-by: Utsav Anand <utsavanand2@gmail.com>

utsavanand2 added a commit to utsavanand2/faas-cli that referenced this pull request Nov 15, 2020

Migrate builds from Travis to Github Actions

4ef030c

Fixes openfaas#838 Thanks to Lucas Roesler for his PR for buildx support openfaas#836 Signed-off-by: Utsav Anand <utsavanand2@gmail.com>

utsavanand2 added a commit to utsavanand2/faas-cli that referenced this pull request Nov 15, 2020

Migrate builds from Travis to Github Actions

7d6213a

Fixes openfaas#838 Thanks to Lucas Roesler for his PR for buildx support openfaas#836 Signed-off-by: Utsav Anand <utsavanand2@gmail.com>

alexellis mentioned this pull request Nov 16, 2020

Add publish command to publish multi-arch images #841

Merged

10 tasks

utsavanand2 added a commit to utsavanand2/faas-cli that referenced this pull request Nov 17, 2020

Migrate builds from Travis to Github Actions

aa87f97

Fixes openfaas#838 Thanks to Lucas Roesler for his PR for buildx support openfaas#836 Signed-off-by: Utsav Anand <utsavanand2@gmail.com>

utsavanand2 added a commit to utsavanand2/faas-cli that referenced this pull request Nov 17, 2020

Migrate builds from Travis to Github Actions

eebbaa9

Fixes openfaas#838 Thanks to Lucas Roesler for his PR for buildx support openfaas#836 Signed-off-by: Utsav Anand <utsavanand2@gmail.com>

utsavanand2 added a commit to utsavanand2/faas-cli that referenced this pull request Nov 17, 2020

Migrate builds from Travis to Github Actions

bc88dc9

Fixes openfaas#838 Thanks to Lucas Roesler for his PR for buildx support openfaas#836 Signed-off-by: Utsav Anand <utsavanand2@gmail.com>

utsavanand2 added a commit to utsavanand2/faas-cli that referenced this pull request Nov 17, 2020

Migrate builds from Travis to Github Actions

25e83de

Fixes openfaas#838 Thanks to Lucas Roesler for his PR for buildx support openfaas#836 Signed-off-by: Utsav Anand <utsavanand2@gmail.com>

alexellis pushed a commit that referenced this pull request Nov 17, 2020

Migrate builds from Travis to Github Actions

15cc71a

Fixes #838 Thanks to Lucas Roesler for his PR for buildx support #836 Signed-off-by: Utsav Anand <utsavanand2@gmail.com>

alexellis closed this Nov 17, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use buildx for multiarch docker builds #836

Use buildx for multiarch docker builds #836

LucasRoesler commented Oct 25, 2020

alexellis Oct 25, 2020

alexellis Oct 25, 2020

alexellis Oct 25, 2020

LucasRoesler Oct 25, 2020

alexellis Oct 25, 2020

alexellis Oct 25, 2020

alexellis Oct 25, 2020

alexellis Oct 25, 2020

LucasRoesler Oct 25, 2020

alexellis left a comment

alexellis Oct 25, 2020

alexellis Oct 25, 2020

alexellis Oct 30, 2020

LucasRoesler Oct 30, 2020

alexellis Oct 30, 2020

LucasRoesler Oct 30, 2020

LucasRoesler Oct 30, 2020

LucasRoesler Oct 30, 2020

alexellis commented Oct 30, 2020 •

edited

Loading

alexellis commented Nov 17, 2020

		@@ -1,14 +1,23 @@
		FROM teamserverless/license-check:0.3.6 as license-check

Use buildx for multiarch docker builds #836

Use buildx for multiarch docker builds #836

Conversation

LucasRoesler commented Oct 25, 2020

Description

Motivation and Context

How Has This Been Tested?

Types of changes

Checklist:

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

alexellis left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

alexellis commented Oct 30, 2020 • edited Loading

alexellis commented Nov 17, 2020

alexellis commented Oct 30, 2020 •

edited

Loading