Merge pull request #27915 from afbjorklund/compat-version

Bump Compat API version to supported v1.44
This commit is contained in:
Paul Holzinger
2026-01-19 17:51:43 +01:00
committed by GitHub
4 changed files with 6 additions and 5 deletions

View File

@@ -22,7 +22,7 @@ for i in /version version; do
.Components[0].Details.APIVersion~6[0-9.-]\\+ \
.Components[0].Details.MinAPIVersion=4.0.0 \
.Components[0].Details.Os=linux \
.ApiVersion=1.41 \
.ApiVersion=1.44 \
.MinAPIVersion=1.24 \
.Os=linux
done

View File

@@ -30,6 +30,7 @@ t POST "containers/foo/attach?logs=true&stream=false" 200 \
$'\001\031'$mytext
# check old docker header
t POST "/v1.40/containers/foo/attach?logs=true&stream=false" 200
response_headers=$(cat "$WORKDIR/curl.headers.out")
like "$response_headers" ".*Content-Type: application/vnd\.docker\.raw-stream.*" "vnd.docker.raw-stream docker v1.40"
# check new vnd.docker.multiplexed-stream header
@@ -45,7 +46,7 @@ like "$response_headers" ".*Content-Type: application/vnd\.docker\.multiplexed-s
t POST "containers/foo/attach?logs=true&stream=false" 101
response_headers=$(cat "$WORKDIR/curl.headers.out")
like "$response_headers" ".*Content-Type: application/vnd\.docker\.raw-stream.*" "hijacked connection header: Content-type: application/vnd.docker.raw-stream"
like "$response_headers" ".*Content-Type: application/vnd\.docker\.multiplexed-stream.*" "hijacked connection header: Content-type: application/vnd.docker.multiplexed-stream"
like "$response_headers" ".*Upgrade: tcp.*" "hijacked connection header: Upgrade: tcp"
t POST "containers/foo/kill" 204

View File

@@ -314,7 +314,7 @@ function t() {
case "$path" in
/*) url="$url$path" ;;
libpod/*) url="$url/v6.0.0/$path" ;;
*) url="$url/v1.41/$path" ;;
*) url="$url/v1.44/$path" ;;
esac
fi

View File

@@ -27,7 +27,7 @@ const (
// Version is the version of the build.
var Version = semver.MustParse(rawversion.RawVersion)
// See https://docs.docker.com/engine/api/v1.40/
// See https://docs.docker.com/reference/api/engine/
// libpod compat handlers are expected to honor docker API versions
// APIVersion provides the current and minimal API versions for compat and libpod endpoint trees
@@ -40,7 +40,7 @@ var APIVersion = map[Tree]map[Level]semver.Version{
MinimalAPI: semver.MustParse("4.0.0"),
},
Compat: {
CurrentAPI: semver.MustParse("1.41.0"),
CurrentAPI: semver.MustParse("1.44.0"),
MinimalAPI: semver.MustParse("1.24.0"),
},
}