mirror of
https://github.com/espressif/esp-matter.git
synced 2026-04-27 19:13:13 +00:00
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:
@@ -76,8 +76,7 @@ jobs:
|
|||||||
- name: Build and push
|
- name: Build and push
|
||||||
uses: docker/build-push-action@v5
|
uses: docker/build-push-action@v5
|
||||||
with:
|
with:
|
||||||
context: tools/docker
|
context: tools/docker/matter_builds
|
||||||
file: tools/docker/matter-builds
|
|
||||||
push: true
|
push: true
|
||||||
tags: |
|
tags: |
|
||||||
${{ env.DOCKERHUB_REPO }}:${{ env.TAG_NAME }}
|
${{ 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
|
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.
|
# Use IDF_CHECKOUT_REF to specify a tag, a branch or a specific commit ID.
|
||||||
Reference in New Issue
Block a user