Merge branch 'fix_docker_build' into 'main'

tools/docker: Fix building docker image and dir restructuring

See merge request app-frameworks/esp-matter!780
This commit is contained in:
Hrishikesh Dhayagude
2024-07-01 06:19:51 +08:00
3 changed files with 6 additions and 3 deletions
+1 -2
View File
@@ -76,8 +76,7 @@ jobs:
- name: Build and push
uses: docker/build-push-action@v5
with:
context: tools/docker
file: tools/docker/matter-builds
context: tools/docker/matter_builds
push: true
tags: |
${{ env.DOCKERHUB_REPO }}:${{ env.TAG_NAME }}
@@ -1,4 +1,8 @@
ARG VERSION=latest
# The chip-build image is moved to Ubuntu 24.04 for Matter v1.4 onwards.
# For Matter v1.3 and earlier, it uses Ubuntu 22.04.
# Therefore, pinning this to version:54 for building Docker images.
# TODO: Move to latest when updating submodule
ARG VERSION=54
FROM ghcr.io/project-chip/chip-build:${VERSION} as build
# Use IDF_CHECKOUT_REF to specify a tag, a branch or a specific commit ID.