Skip to content

Remove outdated DOCKER_BUILDKIT workarounds #101

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

Merged
codefromthecrypt merged 1 commit into from
Mar 23, 2026
Merged

Remove outdated DOCKER_BUILDKIT workarounds #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 0 additions & 5 deletions build-bin/docker/docker_build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,5 @@ docker_tag=${1?full docker_tag is required. Ex openzipkin/zipkin:test}
version=${2:-}
docker_args=$($(dirname "$0")/docker_args ${version})

# We don't need build kit, but Docker 20.10 no longer accepts --platform
# without it. It is simpler to always enable it vs require maintainers to use
# alternate OCI tools. See https://github.com/moby/moby/issues/41552
export DOCKER_BUILDKIT=1

echo "Building image ${docker_tag}"
docker build --network=host --pull ${docker_args} --tag ${docker_tag} .
9 changes: 0 additions & 9 deletions build-bin/docker/docker_push
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,11 @@
#
# Note: In CI, `configure_docker_push` must be called before invoking this.
#
# Avoid buildx on push for reasons including:
# * Caching is more complex as builder instances must be considered
# * Platform builds run in parallel, leading to port conflict failures (ex in cassandra)
# * 0.4.2 multi-platform builds have failed due to picking the wrong image for a FROM instruction
set -ue

docker_image=${1?docker_image is required, notably without a tag. Ex openzipkin/zipkin}
version=${2:-master}

# We don't need build kit, but Docker 20.10 no longer accepts --platform
# without it. It is simpler to always enable it vs require maintainers to use
# alternate OCI tools. See https://github.com/moby/moby/issues/41552
export DOCKER_BUILDKIT=1

case ${version} in
master )
is_release=false
Expand Down
Loading