sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-09-02 03:12:20 +01:00
Code Issues Releases Wiki Activity

Install python requirements after apt ones for better caching (#2349)

Browse Source 
* Install python requirements after apt ones for better caching

* Fix buildkit caching works differently
This commit is contained in:
Otto Winter
2021-09-20 10:31:48 +02:00
committed by GitHub
parent 7452ef23b1
commit 2d7f8b3bdf
2 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
docker/build.py
View File

@@ -109,9 +109,9 @@ def main():
# 1. pull cache image
params = DockerParams.for_type_arch(args.build_type, args.arch)
cache_tag = {
CHANNEL_DEV: "dev",
CHANNEL_BETA: "beta",
CHANNEL_RELEASE: "latest",
CHANNEL_DEV: "cache-dev",
CHANNEL_BETA: "cache-beta",
CHANNEL_RELEASE: "cache-latest",
}[channel]
cache_img = f"ghcr.io/{params.build_to}:{cache_tag}"
@@ -123,7 +123,7 @@ def main():
"docker", "buildx", "build",
"--build-arg", f"BASEIMGTYPE={params.baseimgtype}",
"--build-arg", f"BUILD_VERSION={args.tag}",
"--cache-from", cache_img,
"--cache-from", f"type=registry,ref={cache_img}",
"--file", "docker/Dockerfile",
"--platform", params.platform,
"--target", params.target,
@@ -131,7 +131,7 @@ def main():
for img in imgs:
cmd += ["--tag", img]
if args.push:
cmd.append("--push")
cmd += ["--push", "--cache-to", f"type=registry,ref={cache_img},mode=max"]
run_command(*cmd, ".")
elif args.command == "manifest":