Skip to content

Commit eb8dcc1

Browse files
authored
Update all userspace, downgrade kernel for debian, fix conntrack issue (#169)
1 parent 87eb6b7 commit eb8dcc1

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

debian/docker-make.debian.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ default-build-args:
1010
- BASE_OS_NAME=debian
1111
- OS_NAME=debian
1212
- DOCKER_APT_OS=debian
13-
- CRI_VERSION=v1.24.2
13+
- CRI_VERSION=v1.26.0
1414
- ICE_VERSION=1.9.11
1515
- ICE_PKG_VERSION=1.3.30.0
1616
builds:
@@ -23,10 +23,10 @@ builds:
2323
- BASE_OS_VERSION=10
2424
- DOCKER_APT_CHANNEL=buster
2525
- FRR_VERSION=frr-8
26-
- FRR_VERSION_DETAIL=8.3.1-0~deb10u1
26+
- FRR_VERSION_DETAIL=8.4.1-0~deb10u1
2727
- SEMVER_MAJOR_MINOR=10
2828
- SEMVER=${SEMVER_MAJOR_MINOR}${SEMVER_PATCH}
29-
- KERNEL_VERSION=5.10.149-2
29+
- KERNEL_VERSION=5.10.158-2
3030
after:
3131
- cd ../ && OS_NAME=${OS_NAME} ./test.sh quay.io/metalstack/${OS_NAME}:${SEMVER}
3232
- OS_NAME=${OS_NAME} SEMVER_MAJOR_MINOR=${SEMVER_MAJOR_MINOR} SEMVER_PATCH=${SEMVER_PATCH} ../export.sh

debian/docker-make.ubuntu.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ default-build-args:
1111
- OS_NAME=ubuntu
1212
- DOCKER_APT_OS=ubuntu
1313
- DOCKER_APT_CHANNEL=focal
14-
- CRI_VERSION=v1.24.2
15-
- UBUNTU_MAINLINE_KERNEL_VERSION=v5.10.133 # none of the newer versions exists for amd64
14+
- CRI_VERSION=v1.26.0
15+
- UBUNTU_MAINLINE_KERNEL_VERSION=v6.1.4
1616
- ICE_VERSION=1.9.11
1717
- ICE_PKG_VERSION=1.3.30.0
1818
builds:
@@ -24,7 +24,7 @@ builds:
2424
build-args:
2525
- BASE_OS_VERSION=20.04
2626
- FRR_VERSION=frr-8
27-
- FRR_VERSION_DETAIL=8.3.1-0~ubuntu20.04.1
27+
- FRR_VERSION_DETAIL=8.4.1-0~ubuntu20.04.1
2828
- SEMVER_MAJOR_MINOR=20.04
2929
- SEMVER=${SEMVER_MAJOR_MINOR}${SEMVER_PATCH}
3030
after:

0 commit comments

Comments
 (0)