Skip to content

Commit ee1a65f

Browse files
authored
Merge pull request #4254 from saschagrunert/fix-docker-api-version
Prevent Docker plugin installation in k8s-cloud-builder
2 parents 0dd247c + 2f60914 commit ee1a65f

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

images/k8s-cloud-builder/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ ENV PATH="${GOOGLE_DIR}/google-cloud-sdk/bin:${PATH}"
8383
# https://docs.docker.com/install/linux/docker-ce/debian/
8484
# Pin to version 24.0.x for API version 1.43 compatibility with DinD in CI
8585
# See: https://github.com/kubernetes/release/issues/4180
86+
# Exclude buildx and compose plugins which pull in newer API versions
8687
RUN curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add - \
8788
&& apt-key fingerprint 0EBFCD88 \
8889
&& add-apt-repository \
@@ -91,7 +92,9 @@ RUN curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add - \
9192
stable" \
9293
&& apt-get -y update \
9394
&& apt-get -qqy install \
94-
docker-ce-cli=5:24.0.*
95+
--no-install-recommends \
96+
docker-ce-cli=5:24.0.* \
97+
&& apt-mark hold docker-ce-cli
9598

9699
# Cleanup a bit
97100
RUN apt-get -qqy remove \

0 commit comments

Comments
 (0)