diff --git a/.ci/docker/build.sh b/.ci/docker/build.sh index a45516f46a22..426f4698c2b0 100755 --- a/.ci/docker/build.sh +++ b/.ci/docker/build.sh @@ -366,7 +366,7 @@ if [[ "$image" == *cuda* && ${OS} == "ubuntu" ]]; then fi # Build image -DOCKER_BUILDKIT=1 docker build \ +docker build \ --no-cache \ --progress=plain \ --build-arg "BUILD_ENVIRONMENT=${image}" \ diff --git a/Dockerfile b/Dockerfile index 83e9fd93f0c0..b8ff65fdd1e9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,10 @@ -# syntax = docker/dockerfile:experimental +# syntax=docker/dockerfile:1 + +# NOTE: Building this image require's docker version >= 23.0. # -# NOTE: To build this you will need a docker version > 18.06 with -# experimental enabled and DOCKER_BUILDKIT=1 -# -# If you do not use buildkit you are not going to have a good time -# -# For reference: -# https://docs.docker.com/develop/develop-images/build_enhancements/ +# For reference: +# - https://docs.docker.com/build/dockerfile/frontend/#stable-channel + ARG BASE_IMAGE=ubuntu:22.04 ARG PYTHON_VERSION=3.11 diff --git a/docker.Makefile b/docker.Makefile index 62ba7168d9ba..e8e0d1a46713 100644 --- a/docker.Makefile +++ b/docker.Makefile @@ -57,8 +57,7 @@ PUSH_FLAG = --push endif endif -DOCKER_BUILD = DOCKER_BUILDKIT=1 \ - docker $(BUILD) \ +DOCKER_BUILD = docker $(BUILD) \ --progress=$(BUILD_PROGRESS) \ $(EXTRA_DOCKER_BUILD_FLAGS) \ $(PLATFORMS_FLAG) \