fix(arm64): use qemu to do the packaging step for arm64 images refs: #ENGEN-715 #520

hutchic · 2022-07-27T14:52:47Z

Goal of the PR is the addition of release-kong-docker-images make task that uses build-test-container to build production worthy docker images and push them (leaving the task of renaming build-test-container and a few misnamed environment variables for a subsequent PR)

Putting this capability into kong-build-tools as it's the sensible location to share the logic between Kong and Kong Enterprise without having to copy-pasta between the two repositories. The build-test-container image name change is backwards compatible as it was assigned a variable everywhere it was used.

Previous result

make package-kong && make build-test-container
localhost:3000/kong-ubuntu-20.04

Adjusted result

export DOCKER_RELEASE_REPOSITORY=kong/kong #default
make package-kong && make build-test-container
# locally available docker images
kong/kong:3.0.0-ubuntu-20.04 # multi-arch if building arm
kong/kong:amd64-3.0.0-ubuntu-20.04
kong/kong:arm64-3.0.0-ubuntu-20.04 # only if building arm

New behaviour

export ADDITIONAL_TAGS="hello world"
export DOCKER_RELEASE_REPOSITORY=foo/bar
make package-kong && make release-kong-docker-images
# pushed docker images
foo/bar:3.0.0-ubuntu-20.04 # multi-arch if building arm
foo/bar:amd64-3.0.0-ubuntu-20.04
foo/bar:arm64-3.0.0-ubuntu-20.04 # only if building arm

foo/bar:hello
foo/bar:amd64-hello
foo/bar:arm64-hello

foo/bar:world
foo/bar:amd64-world
foo/bar:arm64-world

This reverts commit 3913aaa.

This reverts commit f6c9a27.

curiositycasualty · 2022-07-29T20:16:04Z

Makefile

@@ -43,11 +43,12 @@ OFFICIAL_RELEASE ?= true
 PACKAGE_CONFLICTS ?= `grep PACKAGE_CONFLICTS $(KONG_SOURCE_LOCATION)/.requirements | awk -F"=" '{print $$2}'`
 PACKAGE_PROVIDES ?= `grep PACKAGE_PROVIDES $(KONG_SOURCE_LOCATION)/.requirements | awk -F"=" '{print $$2}'`
 PACKAGE_REPLACES ?= `grep PACKAGE_REPLACES $(KONG_SOURCE_LOCATION)/.requirements | awk -F"=" '{print $$2}'`
-DOCKER_RELEASE_REPOSITORY ?= `grep DOCKER_RELEASE_REPOSITORY $(KONG_SOURCE_LOCATION)/.requirements | awk -F"=" '{print $$2}'`


Did this get tested with kong-ee? I am skeptical this would correctly overwrite with the variable's value in .requirements (https://github.com/Kong/kong-ee/blob/c2d854b8dea021ab581588b8e758665a519e4746/.requirements#L9)

I couldn't find a way to keep this PR backwards compatible with current Kong CE which doesn't have a value for DOCKER_RELEASE_REPOSITORY.

Someway of in order of precedence:

use an environment variable

use the DOCKER_RELEASE_REPOSITORY value from .requirements

some sensible default

I think our build infrastructure for the gateway product already presumes that default values pertain to the building of CE. So option 3, a sensible default for the value required for the CE build, makes sense to me.

curiositycasualty · 2022-07-29T20:19:56Z

Makefile

-	DOCKER_TLS_VERIFY=1 \
-	DOCKER_HOST=$(shell docker-machine env $(DOCKER_MACHINE_ARM64_NAME) | grep 'DOCKER_HOST=".*"' | cut -d\" -f2) \
-	DOCKER_CERT_PATH=$(shell docker-machine env $(DOCKER_MACHINE_ARM64_NAME) | grep 'DOCKER_CERT_PATH=".*"' | cut -d\" -f2) \
+	docker run --rm --privileged multiarch/qemu-user-static --reset -p yes && \


So, does this PR do away with docker-machine? If so, we should also strip out the docker-machine install.

It does not.

We use docker-machine / a remote arm worker for the purposes of building Kong arm64. The final step of packaing and placing said package onto the host system output/ directory is via qemu.

README.md

test/tests/01-package/run.sh

.ci/setup_ci.sh

test/tests/01-package/run.sh

github-actions · 2022-08-03T20:44:43Z

🎉 This PR is included in version 4.33.8 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

…#ENGEN-715 (#520) * fix(arm64): use qemu to do the packaging step for arm64 images * chore(revert): revert me * Revert "chore(revert): revert me" This reverts commit 3913aaa. * chore(src): dont do anything when we're doing a source code release * small tweaks * fix(arm64): s/BUILDPLATFORM/TARGETPLATFORM/g * docs(README): update and refresh the README.md * test(wip): run only the oss alpine build #revertme * Revert "test(wip): run only the oss alpine build #revertme" This reverts commit 17444f5. * chore(fix): facepalm * fix(ci): ADDITIONAL_TAGS applies to non arm manifests as well * Update test/tests/01-package/run.sh

hutchic force-pushed the fix/arm-images branch 4 times, most recently from ab15393 to ec0d62d Compare July 27, 2022 19:20

hutchic added 3 commits July 27, 2022 20:52

fix(arm64): use qemu to do the packaging step for arm64 images

ce729c2

chore(revert): revert me

7dfc5b7

Revert "chore(revert): revert me"

dd637bc

This reverts commit 3913aaa.

hutchic force-pushed the fix/arm-images branch from 3913aaa to dd637bc Compare July 27, 2022 20:52

hutchic added 2 commits July 27, 2022 21:33

chore(src): dont do anything when we're doing a source code release

03ae3ea

small tweaks

bae728e

hutchic force-pushed the fix/arm-images branch 3 times, most recently from 648d71b to cd6639c Compare July 28, 2022 18:09

fix(arm64): s/BUILDPLATFORM/TARGETPLATFORM/g

f578c26

hutchic force-pushed the fix/arm-images branch from cd6639c to f578c26 Compare July 28, 2022 19:13

hutchic added 3 commits July 28, 2022 20:37

docs(README): update and refresh the README.md

5df9edc

test(wip): run only the oss alpine build #revertme

f6c9a27

Revert "test(wip): run only the oss alpine build #revertme"

3a6aaeb

This reverts commit f6c9a27.

hutchic force-pushed the fix/arm-images branch from b5dc954 to a597960 Compare July 29, 2022 12:16

chore(fix): facepalm

3730064

hutchic force-pushed the fix/arm-images branch from a597960 to 3730064 Compare July 29, 2022 12:17

hutchic marked this pull request as ready for review July 29, 2022 12:50

fix(ci): ADDITIONAL_TAGS applies to non arm manifests as well

0f0448c

hutchic mentioned this pull request Jul 29, 2022

chore(ci): arm builds refs: #ENGEN-715 Kong/kong#9168

Merged

hutchic requested review from curiositycasualty and aboudreault July 29, 2022 20:11

curiositycasualty reviewed Jul 29, 2022

View reviewed changes

hutchic commented Jul 29, 2022

View reviewed changes

.ci/setup_ci.sh Show resolved Hide resolved

test/tests/01-package/run.sh Outdated Show resolved Hide resolved

test/tests/01-package/run.sh Outdated Show resolved Hide resolved

Update test/tests/01-package/run.sh

11d0515

hutchic changed the title ~~fix(arm64): use qemu to do the packaging step for arm64 images~~ fix(arm64): use qemu to do the packaging step for arm64 images refs: #ENGEN-715 Aug 3, 2022

curiositycasualty merged commit 86e23c3 into master Aug 3, 2022

curiositycasualty deleted the fix/arm-images branch August 3, 2022 20:43

github-actions bot added the released label Aug 3, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(arm64): use qemu to do the packaging step for arm64 images refs: #ENGEN-715 #520

fix(arm64): use qemu to do the packaging step for arm64 images refs: #ENGEN-715 #520

hutchic commented Jul 27, 2022 •

edited

Loading

curiositycasualty Jul 29, 2022

hutchic Jul 29, 2022

curiositycasualty Aug 3, 2022

curiositycasualty Jul 29, 2022

hutchic Jul 29, 2022

github-actions bot commented Aug 3, 2022

fix(arm64): use qemu to do the packaging step for arm64 images refs: #ENGEN-715 #520

fix(arm64): use qemu to do the packaging step for arm64 images refs: #ENGEN-715 #520

Conversation

hutchic commented Jul 27, 2022 • edited Loading

curiositycasualty Jul 29, 2022

Choose a reason for hiding this comment

hutchic Jul 29, 2022

Choose a reason for hiding this comment

curiositycasualty Aug 3, 2022

Choose a reason for hiding this comment

curiositycasualty Jul 29, 2022

Choose a reason for hiding this comment

hutchic Jul 29, 2022

Choose a reason for hiding this comment

github-actions bot commented Aug 3, 2022

hutchic commented Jul 27, 2022 •

edited

Loading