Commit Graph

7761 Commits

Author SHA1 Message Date
Krister Johansen
13068d54d4 Enable bcc in the kernel build again.
The bcc portion of the build had been disabled because it wasn't
building.  Now that bcc is building again, add it back to the list of
default targets in the kernel build.

Signed-off-by: Krister Johansen <krister.johansen@oracle.com>
2021-06-08 21:00:05 -07:00
Krister Johansen
898232ceab Get BCC building again.
This moves up to bcc 0.20.0 and builds on the latest 3.13 Alpine base
image.  It uses libelf from Alpine, which allows us to drop a number of
the patches we were carrying and reduce the number of steps taken in the
bcc build.

This builds for me on a branch of tip against 5.11.x, 5.10.x,
5.10.x-dbg, and 5.4.x on x86_65.  I have not had a chance to attempt
this on other platforms due to lack of hardware.

Signed-off-by: Krister Johansen <krister.johansen@oracle.com>
2021-06-08 20:57:10 -07:00
David Scott
79b32dc2c7
Merge pull request #3554 from thaJeztah/update_docker_containerd
Update docker 20.10.6
2021-06-02 10:34:40 +01:00
Rolf Neugebauer
c49cd91386
Merge pull request #3679 from rn/kern-up
Update kernels to 5.11.22/5.10.39/5.4.121
2021-06-02 08:59:24 +01:00
Rolf Neugebauer
0d8bb78f07 tests: Fix kernel builder tests
Some kernels are only build for some architectures. The
test assumed that all kernels were build for all architectures.

Now, get a list of architectures for which we have a given
kernel image and then make sure the builder images pointed
to by the label and the builder image tagged by convention
exist and point to the same thing.

Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
2021-06-01 22:51:10 +00:00
Rolf Neugebauer
0e025d8fb9 Update YAMLs and tests to latest kernels
Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
2021-05-28 09:18:12 +01:00
Rolf Neugebauer
6b0e1b709d tests: Copy kernel-builder from the correct location
Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
2021-05-27 13:06:15 +01:00
Rolf Neugebauer
5f959a9bcd kernel: Move build label add to Makefile
where the other labels are defined

Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
2021-05-27 13:06:15 +01:00
Rolf Neugebauer
70ac373206 kernel: Fix ARG handling in Dockerfiles
At least for the perf image I got an error when
not having the ARG up front.

Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
2021-05-27 00:16:26 +00:00
Rolf Neugebauer
c25cc37643 kernel: Remove remnants of DOCKER_CONTENT_TRUST
Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
2021-05-27 00:16:26 +00:00
Rolf Neugebauer
2c728f89d9 kernel: Update to 5.11.22/5.10.39/5.4.121
Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
2021-05-26 22:33:23 +01:00
Rolf Neugebauer
9c7f158bd1 kernel: Fix KERNEL_SOURCE
Declare KERNEL_SOURCE as an environment variable so it
get's picked up in kernel-source-info

fixes #3653

Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
2021-05-26 22:33:23 +01:00
Rolf Neugebauer
fb283d2baf kernel: Remove out of kernel WireGuard build
5.4.x is the only kernel left which does not have
WireGuard in tree and it people should be using more
recent kernels. Remove the now special case for
compiling out of tree WireGuard.

Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
2021-05-26 22:33:23 +01:00
Rolf Neugebauer
1337e07d3e kernel: Remove 4.19 patches
Must have missed those when removing 4.19 support in
f9f85bd4b3 ("kernel: Remove older LTS kernels")

Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
2021-05-26 22:33:23 +01:00
Dave Tucker
6312d58032
Merge pull request #3659 from edvinerikson/fix-install
fix: make command
2021-05-26 14:27:52 +01:00
Avi Deitcher
77026d5283
Merge pull request #3671 from deitch/cache-export
Add support for cache export
2021-05-26 14:26:26 +03:00
Dave Tucker
452910c625 Makefile: Don't encode bindir in the tar archive
Prior to this commit we go build -o bin/foo, archive it, and
expand the archive, leaving the resulting artifact in bin.

This doesn't allow us to easily change the bin directory, or
move parts of the makefile around to make things more modular.

This commit changes the behaviour to:
go build -o foo, archive it, expand to `bin`

Signed-off-by: Dave Tucker <dave@dtucker.co.uk>
2021-05-26 11:18:41 +01:00
Avi Deitcher
4795c993ee Add support for cache export
Signed-off-by: Avi Deitcher <avi@deitcher.net>
2021-05-26 13:13:37 +03:00
Rolf Neugebauer
c63162964f
Merge pull request #3651 from deitch/kernel-tagging
tag kernel with builder version; simplify Makefile
2021-05-25 22:55:31 +01:00
Avi Deitcher
d053a0f279 tag kernel with builder version; simplify Makefile
Signed-off-by: Avi Deitcher <avi@deitcher.net>
2021-05-25 15:51:01 +03:00
Rolf Neugebauer
fc09bc084a
Merge pull request #3666 from deitch/alpine-hash
calculate manifest using same method as lkt pkg push via git ls-tree
2021-05-21 23:20:44 +01:00
Avi Deitcher
4adc04a24d calculate manifest hash-tag using git ls-tree
Signed-off-by: Avi Deitcher <avi@deitcher.net>
2021-05-21 01:31:14 +03:00
Avi Deitcher
c4d8b1a250
Merge pull request #3670 from rvs/riscv64
Allowing linuxkit to recongnize linux/riscv64 arch
2021-05-20 09:44:03 +03:00
Roman Shaposhnik
378cfc0b3d Allowing linuxkit to recongnize linux/riscv64 arch
Signed-off-by: Roman Shaposhnik <rvs@zededa.com>
2021-05-19 12:34:07 -07:00
Avi Deitcher
1096165072
Merge pull request #3668 from deitch/build-image 2021-05-18 22:36:34 +03:00
Avi Deitcher
f7ee51d931 add v1tarreader for images and use it for docker load
Signed-off-by: Avi Deitcher <avi@deitcher.net>
2021-05-18 18:14:23 +03:00
Avi Deitcher
ebf570d045 refactor buildContext into a simple stdin reader
Signed-off-by: Avi Deitcher <avi@deitcher.net>
2021-05-18 18:14:23 +03:00
Avi Deitcher
dd09b7d77a simplify nobuild/force/build logic
Signed-off-by: Avi Deitcher <avi@deitcher.net>
2021-05-18 18:14:22 +03:00
David Scott
84a5bc10c9
Merge pull request #3669 from djs55/trim-after-delete-arches
trim-after-delete: avoid building on s390x
2021-05-18 15:34:53 +01:00
David Scott
e463855425 trim-after-delete: avoid building on s390x
Signed-off-by: David Scott <dave@recoil.org>
2021-05-18 13:39:20 +01:00
David Scott
71598cc050
Merge pull request #3667 from aiordache/trim_after_delete_events
[POS-17] Add more docker event types to trigger fstrim
2021-05-17 14:04:01 +01:00
Rolf Neugebauer
8c16d6ac3a
Merge pull request #3664 from rn/open-vm
Include open-vm-tools packages
2021-05-15 10:46:34 +01:00
Anca Iordache
d326c1b2e6 Add more event types to trigger fstrim
Signed-off-by: Anca Iordache <anca.iordache@docker.com>
2021-05-12 16:12:14 +02:00
Avi Deitcher
8dd089ae93
Merge pull request #3665 from deitch/alpine-fix-targetauth
correctly use target-arch
2021-05-10 15:32:20 +03:00
Avi Deitcher
4d9de9a583 correctly use target-arch
Signed-off-by: Avi Deitcher <avi@deitcher.net>
2021-05-10 12:21:33 +03:00
Rolf Neugebauer
7b836c2bd8 Include open-vm-tools packages
In alpine version 3.12, the open-vm-tools package got split into new
smaller sub-packages. The implication of this is that features such as
reporting of hostname and ip address to vCenter stopped working.

Signed-off-by: Edvin Eriksson <edvin.erikson@leovegas.com>
Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
2021-05-09 11:22:12 +00:00
Edvin Eriksson
f4c4ab1c8c fix: install linuxkit in top-level bin folder
Signed-off-by: Edvin Eriksson <edvin.erikson@leovegas.com>
2021-05-07 14:22:15 +02:00
Avi Deitcher
ceef6b1ca2
Merge pull request #3650 from deitch/alpine-hash
alpine carry its own hash
2021-05-06 13:11:41 -04:00
Avi Deitcher
a571a5ac21
Merge pull request #3658 from deitch/multiple-build-push
Build or push multiple packages at once
2021-05-06 12:40:23 -04:00
Avi Deitcher
31ed260e4a Build or push multiple packages at once
Signed-off-by: Avi Deitcher <avi@deitcher.net>
2021-05-05 16:52:27 -04:00
Rolf Neugebauer
be2813f51f
Merge pull request #3654 from rn/kern-up
Update kernels
2021-05-03 23:45:16 +01:00
Rolf Neugebauer
be98caafb9 Update test to latest stable kernels
Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
2021-05-03 22:09:08 +01:00
Rolf Neugebauer
031e130c8c Update default kernel to 5.10.x
Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
2021-05-03 22:06:31 +01:00
Rolf Neugebauer
f98a4160e4 tests: Update kernel tests to use latest linuxkit/alpine
Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
2021-05-03 18:18:24 +01:00
Rolf Neugebauer
921af882e1 tests: Remove 4.19.x tests
Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
2021-05-03 18:17:04 +01:00
Rolf Neugebauer
c0f50012d2 kernel: Disable bcc
The build fails, see https://github.com/linuxkit/linuxkit/issues/3652

Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
2021-05-03 17:05:39 +00:00
Rolf Neugebauer
198f6222dd kernel: Update kernel config to new alpine tools
Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
2021-05-03 15:59:01 +00:00
Rolf Neugebauer
5167746df9 kernel: Add patches for 5.10.x/5.11.x
This fixes some compile issues with bcc.

Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
2021-05-03 15:58:48 +00:00
Rolf Neugebauer
a87a666408 kernel: Pick python3 for bcc builds
Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
2021-05-03 14:20:24 +00:00
Rolf Neugebauer
2d92dc189c kernel: Add libelf-static to perf build
Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
2021-05-03 13:54:20 +00:00