Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update container stack to the latest possible on kirkstone #932

Merged
merged 6 commits into from
Nov 20, 2022
Merged

Update container stack to the latest possible on kirkstone #932

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3fdef90
base: non-clangable: add runc-opencontainers
ricardosalveti Nov 18, 2022
f44a387
base: runc-opencontainers: update to 1.1.4
ricardosalveti Nov 18, 2022
b2c410d
base: containerd-opencontainers: update to 1.6.9
ricardosalveti Nov 18, 2022
f40b6fe
base: docker-ce: update to 20.10.21
ricardosalveti Nov 18, 2022
ad68d02
base: docker-compose: update to v2.10.2
ricardosalveti Nov 18, 2022
82e4c02
base: nerdctl: update to v0.22.2
ricardosalveti Nov 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions meta-lmp-base/conf/distro/include/non-clangable.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,3 +124,8 @@ TOOLCHAIN:pn-opensbi = "gcc"
# | clang-14: error: unknown argument: '-fno-toplevel-reorder'
# | clang-14: warning: optimization flag '-fno-merge-constants' is not supported [-Wignored-optimization-argument]
TOOLCHAIN:pn-efitools = "gcc"

# github.com/seccomp/libseccomp-golang
# vendor/github.com/seccomp/libseccomp-golang/seccomp_internal.go:619:2: duplicate case _Ciconst_C_ACT_KILL_THREAD (value 0) in switch
# previous case at vendor/github.com/seccomp/libseccomp-golang/seccomp_internal.go:615:2
TOOLCHAIN:pn-runc-opencontainers = "gcc"
10 changes: 6 additions & 4 deletions meta-lmp-base/recipes-containers/containerd/containerd-opencontainers_git.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ DESCRIPTION = "containerd is a daemon to control runC, built for performance and
support as well as checkpoint and restore for cloning and live migration of containers."


SRCREV = "3df54a852345ae127d1fa3092b95168e4a88e2f8"
SRC_URI = "git://github.com/containerd/containerd;branch=release/1.5;protocol=https \
SRCREV = "1c90a442489720eec95342e1789ee8a5e1b9536f"
SRC_URI = "git://github.com/containerd/containerd;branch=release/1.6;protocol=https \
file://0001-Add-build-option-GODEBUG-1.patch \
file://0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch \
"
Expand All @@ -15,7 +15,8 @@ SRC_URI = "git://github.com/containerd/containerd;branch=release/1.5;protocol=ht
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=1269f40c0d099c21a871163984590d89"

CONTAINERD_VERSION = "v1.5.11"
CONTAINERD_VERSION = "v1.6.9"
CVE_VERSION = "1.6.9"

EXTRA_OEMAKE += "GODEBUG=1"

Expand Down Expand Up @@ -54,7 +55,8 @@ do_compile() {
protobuf reference diff platforms runtime remotes version archive dialer gc metadata \
metrics filters identifiers labels leases plugin server services \
cmd cio containers namespaces oci events log reaper sys rootfs nvidia seed apparmor seccomp \
cap cri userns atomic ioutil os registrar seutil runtimeoptions netns; do
cap cri userns atomic ioutil os registrar seutil runtimeoptions netns \
shutdown schedcore tracing kmutex; do
if [ -d ${S}/src/import/${c} ]; then
ln -sfn ${S}/src/import/${c} ${S}/src/import/vendor/github.com/containerd/containerd/${c}
fi
Expand Down
2 changes: 1 addition & 1 deletion ...rs/docker-compose/docker-compose_2.6.0.bb → ...s/docker-compose/docker-compose_2.10.2.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ SRC_URI = "\
file://cli-config-support-default-system-config.patch \
"

SRCREV_compose = "6756732fe45285f61d459809c36eed0f28fdd58b"
SRCREV_compose = "36926c41c6ff719b376a42f7aa6c1eae98f1ae7e"
SRCREV_cli = "2b52f62e962783ef39b53d1cb95e1d435b33f3cd"
SRCREV_FORMAT = "compose_cli"

Expand Down
9 changes: 5 additions & 4 deletions meta-lmp-base/recipes-containers/docker/docker-ce_git.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ DESCRIPTION = "Linux container runtime \
# so we get that tag, and make it our SRCREVS:
#

SRCREV_docker = "87a90dc786bda134c9eb02adbae2c6a7342fb7f6"
SRCREV_libnetwork = "64b7a4574d1426139437d20e81c0b6d391130ec8"
SRCREV_cli = "a224086349269551becacce16e5842ceeb2a98d6"
SRCREV_docker = "3056208812eb5e792fa99736c9167d1e10f4ab49"
SRCREV_libnetwork = "0dde5c895075df6e3630e76f750a447cf63f4789"
SRCREV_cli = "baeda1f82a10204ec5708d5fbba130ad76cfee49"
SRCREV_FORMAT = "docker_libnetwork"
SRC_URI = "\
git://github.com/docker/docker.git;branch=20.10;name=docker;protocol=https \
Expand All @@ -47,6 +47,7 @@ SRC_URI = "\
file://increase_containerd_timeouts.patch \
file://0001-registry-increase-TLS-and-connection-timeouts.patch \
file://0001-overlay2-fsync-layer-metadata-files.patch \
file://0001-Revert-20.10-vendor-update-archive-tar-for-go-1.18.patch \
"

require recipes-containers/docker/docker.inc
Expand All @@ -56,7 +57,7 @@ require docker-lmp.inc
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=4859e97a9c7780e77972d989f0823f28"

DOCKER_VERSION = "20.10.14-ce"
DOCKER_VERSION = "20.10.21-ce"
PV = "${DOCKER_VERSION}+git${SRCREV_docker}"

CVE_PRODUCT = "docker"
Loading