Skip to content

Commit da4dc3b

Browse files
committed
Update Dockerfile and workflows to use BASE_IMAGE_TAG for ESP-IDF versioning
- Refactor Dockerfile to replace ESP_IDF_VERSION with BASE_IMAGE_TAG for improved clarity and consistency in versioning. - Update GitHub Actions workflow to align with the new BASE_IMAGE_TAG format, ensuring seamless integration during builds. - Modify README to reflect changes in build arguments, enhancing user understanding of the build process.
1 parent 4b6a7ae commit da4dc3b

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

.github/workflows/esp-idf.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ jobs:
144144
cache-from: type=gha,scope=esp-matter-${{ steps.platform.outputs.tag }}
145145
cache-to: type=gha,mode=max,scope=esp-matter-${{ steps.platform.outputs.tag }}
146146
build-args: |
147-
ESP_IDF_VERSION=${{ matrix.esp_idf_version }}
147+
BASE_IMAGE_TAG=idf-${{ matrix.esp_idf_version }}-${{ steps.platform.outputs.tag }}
148148
ESP_MATTER_VERSION=${{ matrix.esp_matter_version }}
149149
150150
create-manifest-matter:

images/esp-matter/Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
# ESP-Matter Development Image
22
# Build arguments for version pinning
3-
ARG ESP_IDF_VERSION=v5.4.1
3+
ARG BASE_IMAGE_TAG=idf-v5.4.1
44
ARG ESP_MATTER_VERSION=v1.4.2
55

66
# Use our esp-idf image as base
7-
# For local builds: Uses idf-${ESP_IDF_VERSION} tag
8-
# For CI/CD: Override with --build-arg BASE_IMAGE_TAG=idf-${ESP_IDF_VERSION}-linux-${ARCH}
9-
ARG BASE_IMAGE_TAG=idf-${ESP_IDF_VERSION}
7+
# For local builds: Uses default idf-v5.4.1 tag
8+
# For CI/CD: Override with --build-arg BASE_IMAGE_TAG=idf-v5.4.1-linux-${ARCH}
109
FROM ghcr.io/jethome-iot/jethome-dev-esp-idf:${BASE_IMAGE_TAG}
1110

1211
# Re-declare build arguments after FROM

images/esp-matter/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,13 +252,13 @@ docker build -t jethome-dev-esp-matter .
252252

253253
```bash
254254
docker build \
255-
--build-arg ESP_IDF_VERSION=v5.4.1 \
255+
--build-arg BASE_IMAGE_TAG=idf-v5.4.1 \
256256
--build-arg ESP_MATTER_VERSION=v1.4.2 \
257257
-t jethome-dev-esp-matter .
258258
```
259259

260260
Available build arguments:
261-
- `ESP_IDF_VERSION` - ESP-IDF version (default: `v5.4.1`)
261+
- `BASE_IMAGE_TAG` - ESP-IDF base image tag (default: `idf-v5.4.1`)
262262
- `ESP_MATTER_VERSION` - ESP-Matter version tag (default: `v1.4.2`)
263263

264264
### Multi-Platform Support

0 commit comments

Comments
 (0)