From b9a766387cab3ba03d489c60d684d671805a7113 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Mon, 28 Nov 2022 16:04:26 +0400 Subject: [PATCH] Replace docker buildx with DOCKER_BUILDKIT=1 environment variable This seem to work better with distribution-provided Docker --- .github/workflows/docker.yml | 2 +- Telegram/build/prepare/linux.sh | 2 +- docs/building-linux.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 74bbdd57c8..520caaf68c 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -31,7 +31,7 @@ jobs: run: | cd Telegram/build/docker/centos_env poetry install - DEBUG= LTO= poetry run gen_dockerfile | docker buildx build -t $IMAGE_TAG - + DEBUG= LTO= poetry run gen_dockerfile | DOCKER_BUILDKIT=1 docker build -t $IMAGE_TAG - - name: Push the Docker image. if: ${{ github.ref_name == github.event.repository.default_branch }} diff --git a/Telegram/build/prepare/linux.sh b/Telegram/build/prepare/linux.sh index fa1b81af4d..7a328bc31e 100755 --- a/Telegram/build/prepare/linux.sh +++ b/Telegram/build/prepare/linux.sh @@ -6,5 +6,5 @@ popd > /dev/null cd $FullScriptPath/../docker/centos_env -poetry run gen_dockerfile | docker buildx build -t tdesktop:centos_env - +poetry run gen_dockerfile | DOCKER_BUILDKIT=1 docker build -t tdesktop:centos_env - cd $FullExecPath diff --git a/docs/building-linux.md b/docs/building-linux.md index 00682d2b46..83906ac89b 100644 --- a/docs/building-linux.md +++ b/docs/building-linux.md @@ -13,7 +13,7 @@ You will require **api_id** and **api_hash** to access the Telegram API servers. Install [poetry](https://python-poetry.org), go to the `tdesktop/Telegram/build/docker/centos_env` directory and run poetry install - poetry run gen_dockerfile | docker buildx build -t tdesktop:centos_env - + poetry run gen_dockerfile | DOCKER_BUILDKIT=1 docker build -t tdesktop:centos_env - ### Building the project