Skip to content
This repository has been archived by the owner on Dec 7, 2023. It is now read-only.

Fix image builds + publish new kernel configs #605

Merged
merged 2 commits into from
Jun 2, 2020

Conversation

stealthybox
Copy link
Contributor

@stealthybox stealthybox commented Jun 2, 2020

Changes:

  • Fix kubeadm image build to support multi-arch
    1. Copy build context when mutating Dockerfile for cross-builds + cleanup
    2. Pass GOARCH as build-arg to support local, dependent, multi-arch images
      in FROM statements
    3. Parameterize build-args for k8s RELEASE and
      BINARY_REF
    4. Update install.sh to take GOARCH as a 4th commandline param
  • Add load into containerd for image Make

The following build now passes and is idempotent on my machine:

make -C images/alpine alpine.tar
make -C images build-all

make -C images/kernel upgrade

make -C images/kernel build
make -C images/kernel GOARCH=arm64 build

make -C images ctr-import-all
make -C images/kernel ctr-import
make -C images/kernel ctr-import GOARCH=arm64

@stealthybox stealthybox force-pushed the image-build branch 2 times, most recently from a9cc7a5 to 7beb909 Compare June 2, 2020 16:01
1. Copy build context when mutating Dockerfile for cross-builds + cleanup
2. Pass GOARCH as build-arg to support local, dependent, multi-arch images in FROM statements
3. Parameterize build-args for k8s RELEASE and BINARY_REF
4. Update install.sh to take GOARCH as a 4th commandline param
Copy link
Contributor

@luxas luxas left a comment

Choose a reason for hiding this comment

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

Thanks, looks good!

@luxas luxas merged commit 83e93f4 into weaveworks:master Jun 2, 2020
@stealthybox stealthybox deleted the image-build branch June 2, 2020 16:15
@luxas luxas added this to the v0.7.0 milestone Jun 2, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants